general: Some small updates

This commit is contained in:
Open Toontown 2019-11-08 19:26:51 -05:00
parent 070cee508d
commit 718020f889
2 changed files with 7 additions and 8 deletions

View file

@ -20,11 +20,10 @@ dc-file etc/otp.dc
window-title Toontown window-title Toontown
verify-ssl 0 verify-ssl 0
ssl-cipher-list DEFAULT ssl-cipher-list DEFAULT
http-preapproved-server-certificate-filename ttown4.online.disney.com:46667 gameserver.txt
chan-config-sanity-check #f chan-config-sanity-check #f
require-window 0 require-window 0
language english language english
icon-filename toontown.ico icon-filename phase_3/models/gui/toontown.ico
dx-management 1 dx-management 1
tt-specific-login 1 tt-specific-login 1
decompressor-buffer-size 32768 decompressor-buffer-size 32768
@ -87,7 +86,7 @@ clock-mode limited
clock-frame-rate 120 clock-frame-rate 120
prefer-parasite-buffer 0 prefer-parasite-buffer 0
audio-library-name miles_audio audio-library-name miles_audio
cursor-filename toonmono.cur cursor-filename phase_3/models/gui/toonmono.cur
audio-loader mp3 audio-loader mp3
audio-loader midi audio-loader midi
audio-loader wav audio-loader wav

View file

@ -57,8 +57,8 @@ backgroundNodePath.setScale(render2d, VBase3(1))
backgroundNodePath.find('**/fg').setBin('fixed', 20) backgroundNodePath.find('**/fg').setBin('fixed', 20)
backgroundNodePath.find('**/bg').setBin('fixed', 10) backgroundNodePath.find('**/bg').setBin('fixed', 10)
base.graphicsEngine.renderFrame() base.graphicsEngine.renderFrame()
DirectGuiGlobals.setDefaultRolloverSound(base.loadSfx('phase_3/audio/sfx/GUI_rollover.mp3')) DirectGuiGlobals.setDefaultRolloverSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_rollover.mp3'))
DirectGuiGlobals.setDefaultClickSound(base.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.mp3')) DirectGuiGlobals.setDefaultClickSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.mp3'))
DirectGuiGlobals.setDefaultDialogGeom(loader.loadModel('phase_3/models/gui/dialog_box_gui')) DirectGuiGlobals.setDefaultDialogGeom(loader.loadModel('phase_3/models/gui/dialog_box_gui'))
import TTLocalizer import TTLocalizer
from otp.otpbase import OTPGlobals from otp.otpbase import OTPGlobals
@ -70,8 +70,8 @@ if base.musicManagerIsValid:
music.setVolume(0.9) music.setVolume(0.9)
music.play() music.play()
print 'ToontownStart: Loading default gui sounds' print 'ToontownStart: Loading default gui sounds'
DirectGuiGlobals.setDefaultRolloverSound(base.loadSfx('phase_3/audio/sfx/GUI_rollover.mp3')) DirectGuiGlobals.setDefaultRolloverSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_rollover.mp3'))
DirectGuiGlobals.setDefaultClickSound(base.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.mp3')) DirectGuiGlobals.setDefaultClickSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.mp3'))
else: else:
music = None music = None
import ToontownLoader import ToontownLoader
@ -108,7 +108,7 @@ __builtin__.loader = base.loader
autoRun = ConfigVariableBool('toontown-auto-run', 1) autoRun = ConfigVariableBool('toontown-auto-run', 1)
if autoRun and launcher.isDummy() and (not Thread.isTrueThreads() or __name__ == '__main__'): if autoRun and launcher.isDummy() and (not Thread.isTrueThreads() or __name__ == '__main__'):
try: try:
run() base.run()
except SystemExit: except SystemExit:
raise raise
except: except: