sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

launcher: Use quick launcher by default

Browse source
This commit is contained in:
John Cote 2021-07-03 22:02:19 -04:00
parent 1ee81ec046
commit bd36f6c463
6 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
darwin/start-game.sh
View file

@ -1,8 +1,6 @@
#!/bin/sh #!/bin/sh
cd .. cd ..
# TODO: Make this actually work, to change token in the meantime,
# change the fake-playtoken variable in etc/Configrc.prc.
export LOGIN_TOKEN=dev export LOGIN_TOKEN=dev
/usr/local/bin/python3.9 -m toontown.toonbase.ToontownStart /usr/local/bin/python3.9 -m toontown.launcher.QuickStartLauncher

4
etc/Configrc.prc
View file

@ -32,6 +32,7 @@ notify-level-gobj warning
notify-level-loader warning notify-level-loader warning
notify-timestamp #t notify-timestamp #t
notify-integrate #f notify-integrate #f
console-output 1
default-model-extension .bam default-model-extension .bam
decompressor-step-time 0.5 decompressor-step-time 0.5
extractor-step-time 0.5 extractor-step-time 0.5
@ -57,6 +58,3 @@ want-dev 0
schellgames-dev 0 schellgames-dev 0
text-minfilter linear_mipmap_linear text-minfilter linear_mipmap_linear
gc-save-all 0 gc-save-all 0
# TEMP
fake-playtoken dev

4
linux/start-game.sh
View file

@ -1,8 +1,6 @@
#!/bin/sh #!/bin/sh
cd .. cd ..
# TODO: Make this actually work, to change token in the meantime,
# change the fake-playtoken variable in etc/Configrc.prc.
export LOGIN_TOKEN=dev export LOGIN_TOKEN=dev
python3 -m toontown.toonbase.ToontownStart python3 -m toontown.launcher.QuickStartLauncher

3
toontown/launcher/QuickStartLauncher.py
View file

@ -1,9 +1,10 @@
from panda3d.core import *
if __debug__: if __debug__:
from panda3d.core import loadPrcFile
loadPrcFile('etc/Configrc.prc') loadPrcFile('etc/Configrc.prc')
else: else:
import sys import sys
sys.path = [''] sys.path = ['']
from toontown.launcher.QuickLauncher import QuickLauncher from toontown.launcher.QuickLauncher import QuickLauncher
launcher = QuickLauncher() launcher = QuickLauncher()
launcher.notify.info('Reached end of StartQuickLauncher.py.') launcher.notify.info('Reached end of StartQuickLauncher.py.')

14
toontown/toonbase/ToontownStart.py
View file

@ -1,8 +1,3 @@
from panda3d.core import *
if __debug__:
loadPrcFile('etc/Configrc.prc')
import builtins import builtins
class game: class game:
@ -11,14 +6,15 @@ class game:
builtins.game = game() builtins.game = game()
from panda3d.core import *
import time import time
import os
import sys import sys
import random
import builtins
try: try:
launcher launcher
except: except:
if __debug__:
loadPrcFile('etc/Configrc.prc')
from toontown.launcher.ToontownDummyLauncher import ToontownDummyLauncher from toontown.launcher.ToontownDummyLauncher import ToontownDummyLauncher
launcher = ToontownDummyLauncher() launcher = ToontownDummyLauncher()
builtins.launcher = launcher builtins.launcher = launcher
@ -74,7 +70,6 @@ if base.musicManagerIsValid:
DirectGuiGlobals.setDefaultClickSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.ogg')) DirectGuiGlobals.setDefaultClickSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.ogg'))
else: else:
music = None music = None
from . import ToontownLoader
from direct.gui.DirectGui import * from direct.gui.DirectGui import *
serverVersion = base.config.GetString('server-version', 'no_version_set') serverVersion = base.config.GetString('server-version', 'no_version_set')
print('ToontownStart: serverVersion: ', serverVersion) print('ToontownStart: serverVersion: ', serverVersion)
@ -89,7 +84,6 @@ del music
base.initNametagGlobals() base.initNametagGlobals()
base.cr = cr base.cr = cr
loader.endBulkLoad('init') loader.endBulkLoad('init')
from otp.friends import FriendManager
from otp.distributed.OtpDoGlobals import * from otp.distributed.OtpDoGlobals import *
cr.generateGlobalObject(OTP_DO_ID_FRIEND_MANAGER, 'FriendManager') cr.generateGlobalObject(OTP_DO_ID_FRIEND_MANAGER, 'FriendManager')
if not launcher.isDummy(): if not launcher.isDummy():

4
win32/start_game.bat
View file

@ -5,9 +5,7 @@ cd..
rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%: rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
set /P PPYTHON_PATH=<PPYTHON_PATH set /P PPYTHON_PATH=<PPYTHON_PATH
rem TODO: Make this actually work, to change token in the meantime,
rem change the fake-playtoken variable in etc/Configrc.prc.
set LOGIN_TOKEN=dev set LOGIN_TOKEN=dev
%PPYTHON_PATH% -m toontown.toonbase.ToontownStart %PPYTHON_PATH% -m toontown.launcher.QuickStartLauncher
pause pause