From 718020f8896e2eeb1b414ad3c6e1471e1a184b68 Mon Sep 17 00:00:00 2001
From: Open Toontown <opentoontown@users.noreply.github.com>
Date: Fri, 8 Nov 2019 19:26:51 -0500
Subject: [PATCH] general: Some small updates

---
 etc/Configrc.prc                   |  5 ++---
 toontown/toonbase/ToontownStart.py | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/etc/Configrc.prc b/etc/Configrc.prc
index 2fdc8ad..72e293e 100644
--- a/etc/Configrc.prc
+++ b/etc/Configrc.prc
@@ -20,11 +20,10 @@ dc-file etc/otp.dc
 window-title Toontown
 verify-ssl 0
 ssl-cipher-list DEFAULT
-http-preapproved-server-certificate-filename ttown4.online.disney.com:46667 gameserver.txt
 chan-config-sanity-check #f
 require-window 0
 language english
-icon-filename toontown.ico
+icon-filename phase_3/models/gui/toontown.ico
 dx-management 1
 tt-specific-login 1
 decompressor-buffer-size 32768
@@ -87,7 +86,7 @@ clock-mode limited
 clock-frame-rate 120
 prefer-parasite-buffer 0
 audio-library-name miles_audio
-cursor-filename toonmono.cur
+cursor-filename phase_3/models/gui/toonmono.cur
 audio-loader mp3
 audio-loader midi
 audio-loader wav
diff --git a/toontown/toonbase/ToontownStart.py b/toontown/toonbase/ToontownStart.py
index 0bde10b..6856a64 100644
--- a/toontown/toonbase/ToontownStart.py
+++ b/toontown/toonbase/ToontownStart.py
@@ -57,8 +57,8 @@ backgroundNodePath.setScale(render2d, VBase3(1))
 backgroundNodePath.find('**/fg').setBin('fixed', 20)
 backgroundNodePath.find('**/bg').setBin('fixed', 10)
 base.graphicsEngine.renderFrame()
-DirectGuiGlobals.setDefaultRolloverSound(base.loadSfx('phase_3/audio/sfx/GUI_rollover.mp3'))
-DirectGuiGlobals.setDefaultClickSound(base.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.mp3'))
+DirectGuiGlobals.setDefaultRolloverSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_rollover.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'))
 import TTLocalizer
 from otp.otpbase import OTPGlobals
@@ -70,8 +70,8 @@ if base.musicManagerIsValid:
         music.setVolume(0.9)
         music.play()
     print 'ToontownStart: Loading default gui sounds'
-    DirectGuiGlobals.setDefaultRolloverSound(base.loadSfx('phase_3/audio/sfx/GUI_rollover.mp3'))
-    DirectGuiGlobals.setDefaultClickSound(base.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.mp3'))
+    DirectGuiGlobals.setDefaultRolloverSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_rollover.mp3'))
+    DirectGuiGlobals.setDefaultClickSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.mp3'))
 else:
     music = None
 import ToontownLoader
@@ -108,7 +108,7 @@ __builtin__.loader = base.loader
 autoRun = ConfigVariableBool('toontown-auto-run', 1)
 if autoRun and launcher.isDummy() and (not Thread.isTrueThreads() or __name__ == '__main__'):
     try:
-        run()
+        base.run()
     except SystemExit:
         raise
     except: