From 665c5ae39e4753c5fdf25dd2ace4fe572c4d4ca4 Mon Sep 17 00:00:00 2001
From: John Cote <jwcotejr@users.noreply.github.com>
Date: Sun, 5 Jan 2020 20:41:44 -0500
Subject: [PATCH] config: finish cleanup

---
 etc/Configrc.prc                    | 9 ---------
 libotp/settings/Settings.py         | 8 --------
 toontown/toonbase/DisplayOptions.py | 4 ----
 toontown/toonbase/ToonBase.py       | 4 ----
 4 files changed, 25 deletions(-)

diff --git a/etc/Configrc.prc b/etc/Configrc.prc
index 26b0d4d..e7a2640 100644
--- a/etc/Configrc.prc
+++ b/etc/Configrc.prc
@@ -12,12 +12,8 @@ require-window 0
 icon-filename phase_3/models/gui/toontown.ico
 dx-management 1
 tt-specific-login 1
-decompressor-buffer-size 32768
-extractor-buffer-size 32768
 patcher-buffer-size 512000
-downloader-timeout 15
 downloader-timeout-retries 4
-downloader-disk-write-frequency 4
 downloader-byte-rate 125000
 downloader-frequency 0.1
 http-connect-timeout 20
@@ -27,8 +23,6 @@ aux-display pandagl
 aux-display pandadx9
 aux-display tinydisplay
 depth-bits 24
-win-size 800 600
-fullscreen #t
 early-random-seed 1
 respect-prev-transform 1
 default-directnotify-level info
@@ -43,7 +37,6 @@ decompressor-step-time 0.5
 extractor-step-time 0.5
 required-login playToken
 server-failover 80 443
-want-fog #t
 dx-use-rangebased-fog #t
 aspect-ratio 1.333333
 on-screen-debug-font ImpressBT.ttf
@@ -60,8 +53,6 @@ audio-library-name null
 cursor-filename phase_3/models/gui/toonmono.cur
 audio-sfx-active #t
 audio-music-active #t
-audio-master-sfx-volume 1
-audio-master-music-volume 1
 want-dev 0
 schellgames-dev 0
 text-minfilter linear_mipmap_linear
diff --git a/libotp/settings/Settings.py b/libotp/settings/Settings.py
index eac320c..8ff63ac 100644
--- a/libotp/settings/Settings.py
+++ b/libotp/settings/Settings.py
@@ -43,14 +43,6 @@ class Settings:
     def getToonChatSounds():
         return 1
 
-    @staticmethod
-    def getMusicVolume():
-        return 1
-
-    @staticmethod
-    def getSfxVolume():
-        return 1
-
     @staticmethod
     def setResolutionDimensions(_, __):
         pass
diff --git a/toontown/toonbase/DisplayOptions.py b/toontown/toonbase/DisplayOptions.py
index 7995265..47ffe2e 100644
--- a/toontown/toonbase/DisplayOptions.py
+++ b/toontown/toonbase/DisplayOptions.py
@@ -27,8 +27,6 @@ class DisplayOptions:
         music = Settings.getMusic()
         sfx = Settings.getSfx()
         toonChatSounds = Settings.getToonChatSounds()
-        musicVol = Settings.getMusicVolume()
-        sfxVol = Settings.getSfxVolume()
         resList = [(640, 480),
          (800, 600),
          (1024, 768),
@@ -57,8 +55,6 @@ class DisplayOptions:
         self.notify.debug('settings full screen mode=%s' % str(mode))
         loadPrcFileData('toonBase Settings Music Active', 'audio-music-active %s' % music)
         loadPrcFileData('toonBase Settings Sound Active', 'audio-sfx-active %s' % sfx)
-        loadPrcFileData('toonBase Settings Music Volume', 'audio-master-music-volume %s' % musicVol)
-        loadPrcFileData('toonBase Settings Sfx Volume', 'audio-master-sfx-volume %s' % sfxVol)
         loadPrcFileData('toonBase Settings Toon Chat Sounds', 'toon-chat-sounds %s' % toonChatSounds)
         self.settingsFullScreen = mode
         self.settingsWidth = res[0]
diff --git a/toontown/toonbase/ToonBase.py b/toontown/toonbase/ToonBase.py
index 2fb280b..dc670b0 100644
--- a/toontown/toonbase/ToonBase.py
+++ b/toontown/toonbase/ToonBase.py
@@ -27,8 +27,6 @@ class ToonBase(OTPBase.OTPBase):
             music = Settings.getMusic()
             sfx = Settings.getSfx()
             toonChatSounds = Settings.getToonChatSounds()
-            musicVol = Settings.getMusicVolume()
-            sfxVol = Settings.getSfxVolume()
             resList = [(640, 480),
              (800, 600),
              (1024, 768),
@@ -43,8 +41,6 @@ class ToonBase(OTPBase.OTPBase):
             loadPrcFileData('toonBase Settings Window FullScreen', 'fullscreen %s' % mode)
             loadPrcFileData('toonBase Settings Music Active', 'audio-music-active %s' % music)
             loadPrcFileData('toonBase Settings Sound Active', 'audio-sfx-active %s' % sfx)
-            loadPrcFileData('toonBase Settings Music Volume', 'audio-master-music-volume %s' % musicVol)
-            loadPrcFileData('toonBase Settings Sfx Volume', 'audio-master-sfx-volume %s' % sfxVol)
             loadPrcFileData('toonBase Settings Toon Chat Sounds', 'toon-chat-sounds %s' % toonChatSounds)
         OTPBase.OTPBase.__init__(self)
         if not self.isMainWindowOpen():