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

config: finish cleanup

Browse source
This commit is contained in:
John Cote 2020-01-05 20:41:44 -05:00
parent 2f0de649ef
commit 665c5ae39e
4 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
etc/Configrc.prc
View file

@ -12,12 +12,8 @@ require-window 0
icon-filename phase_3/models/gui/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
extractor-buffer-size 32768
patcher-buffer-size 512000 patcher-buffer-size 512000
downloader-timeout 15
downloader-timeout-retries 4 downloader-timeout-retries 4
downloader-disk-write-frequency 4
downloader-byte-rate 125000 downloader-byte-rate 125000
downloader-frequency 0.1 downloader-frequency 0.1
http-connect-timeout 20 http-connect-timeout 20
@ -27,8 +23,6 @@ aux-display pandagl
aux-display pandadx9 aux-display pandadx9
aux-display tinydisplay aux-display tinydisplay
depth-bits 24 depth-bits 24
win-size 800 600
fullscreen #t
early-random-seed 1 early-random-seed 1
respect-prev-transform 1 respect-prev-transform 1
default-directnotify-level info default-directnotify-level info
@ -43,7 +37,6 @@ decompressor-step-time 0.5
extractor-step-time 0.5 extractor-step-time 0.5
required-login playToken required-login playToken
server-failover 80 443 server-failover 80 443
want-fog #t
dx-use-rangebased-fog #t dx-use-rangebased-fog #t
aspect-ratio 1.333333 aspect-ratio 1.333333
on-screen-debug-font ImpressBT.ttf on-screen-debug-font ImpressBT.ttf
@ -60,8 +53,6 @@ audio-library-name null
cursor-filename phase_3/models/gui/toonmono.cur cursor-filename phase_3/models/gui/toonmono.cur
audio-sfx-active #t audio-sfx-active #t
audio-music-active #t audio-music-active #t
audio-master-sfx-volume 1
audio-master-music-volume 1
want-dev 0 want-dev 0
schellgames-dev 0 schellgames-dev 0
text-minfilter linear_mipmap_linear text-minfilter linear_mipmap_linear

8
libotp/settings/Settings.py
View file

@ -43,14 +43,6 @@ class Settings:
def getToonChatSounds(): def getToonChatSounds():
return 1 return 1
@staticmethod
def getMusicVolume():
return 1
@staticmethod
def getSfxVolume():
return 1
@staticmethod @staticmethod
def setResolutionDimensions(_, __): def setResolutionDimensions(_, __):
pass pass

4
toontown/toonbase/DisplayOptions.py
View file

@ -27,8 +27,6 @@ class DisplayOptions:
music = Settings.getMusic() music = Settings.getMusic()
sfx = Settings.getSfx() sfx = Settings.getSfx()
toonChatSounds = Settings.getToonChatSounds() toonChatSounds = Settings.getToonChatSounds()
musicVol = Settings.getMusicVolume()
sfxVol = Settings.getSfxVolume()
resList = [(640, 480), resList = [(640, 480),
(800, 600), (800, 600),
(1024, 768), (1024, 768),
@ -57,8 +55,6 @@ class DisplayOptions:
self.notify.debug('settings full screen mode=%s' % str(mode)) self.notify.debug('settings full screen mode=%s' % str(mode))
loadPrcFileData('toonBase Settings Music Active', 'audio-music-active %s' % music) loadPrcFileData('toonBase Settings Music Active', 'audio-music-active %s' % music)
loadPrcFileData('toonBase Settings Sound Active', 'audio-sfx-active %s' % sfx) 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) loadPrcFileData('toonBase Settings Toon Chat Sounds', 'toon-chat-sounds %s' % toonChatSounds)
self.settingsFullScreen = mode self.settingsFullScreen = mode
self.settingsWidth = res[0] self.settingsWidth = res[0]

4
toontown/toonbase/ToonBase.py
View file

@ -27,8 +27,6 @@ class ToonBase(OTPBase.OTPBase):
music = Settings.getMusic() music = Settings.getMusic()
sfx = Settings.getSfx() sfx = Settings.getSfx()
toonChatSounds = Settings.getToonChatSounds() toonChatSounds = Settings.getToonChatSounds()
musicVol = Settings.getMusicVolume()
sfxVol = Settings.getSfxVolume()
resList = [(640, 480), resList = [(640, 480),
(800, 600), (800, 600),
(1024, 768), (1024, 768),
@ -43,8 +41,6 @@ class ToonBase(OTPBase.OTPBase):
loadPrcFileData('toonBase Settings Window FullScreen', 'fullscreen %s' % mode) loadPrcFileData('toonBase Settings Window FullScreen', 'fullscreen %s' % mode)
loadPrcFileData('toonBase Settings Music Active', 'audio-music-active %s' % music) loadPrcFileData('toonBase Settings Music Active', 'audio-music-active %s' % music)
loadPrcFileData('toonBase Settings Sound Active', 'audio-sfx-active %s' % sfx) 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) loadPrcFileData('toonBase Settings Toon Chat Sounds', 'toon-chat-sounds %s' % toonChatSounds)
OTPBase.OTPBase.__init__(self) OTPBase.OTPBase.__init__(self)
if not self.isMainWindowOpen(): if not self.isMainWindowOpen():