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

settings: Minor edits for consistency

Browse source
This commit is contained in:
John Cote 2021-07-07 21:57:15 -04:00
parent 2ec6ceabb4
commit 31b47fd0a9
No known key found for this signature in database
GPG key ID: E3442FF71E9C1C01
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
toontown/shtiker/OptionsPage.py
View file

@ -253,10 +253,10 @@ class OptionsTabPage(DirectFrame):
messenger.send('wakeup') messenger.send('wakeup')
if base.musicActive: if base.musicActive:
base.enableMusic(0) base.enableMusic(0)
base.settings.updateSetting('music', 0) base.settings.updateSetting('music', False)
else: else:
base.enableMusic(1) base.enableMusic(1)
base.settings.updateSetting('music', 1) base.settings.updateSetting('music', True)
self.settingsChanged = 1 self.settingsChanged = 1
self.__setMusicButton() self.__setMusicButton()
@ -272,10 +272,10 @@ class OptionsTabPage(DirectFrame):
messenger.send('wakeup') messenger.send('wakeup')
if base.sfxActive: if base.sfxActive:
base.enableSoundEffects(0) base.enableSoundEffects(0)
base.settings.updateSetting('sfx', 0) base.settings.updateSetting('sfx', False)
else: else:
base.enableSoundEffects(1) base.enableSoundEffects(1)
base.settings.updateSetting('sfx', 1) base.settings.updateSetting('sfx', True)
self.settingsChanged = 1 self.settingsChanged = 1
self.__setSoundFXButton() self.__setSoundFXButton()
@ -283,10 +283,10 @@ class OptionsTabPage(DirectFrame):
messenger.send('wakeup') messenger.send('wakeup')
if base.toonChatSounds: if base.toonChatSounds:
base.toonChatSounds = 0 base.toonChatSounds = 0
base.settings.updateSetting('toon-chat-sounds', 0) base.settings.updateSetting('toon-chat-sounds', False)
else: else:
base.toonChatSounds = 1 base.toonChatSounds = 1
base.settings.updateSetting('toon-chat-sounds', 1) base.settings.updateSetting('toon-chat-sounds', True)
self.settingsChanged = 1 self.settingsChanged = 1
self.__setToonChatSoundsButton() self.__setToonChatSoundsButton()
@ -317,10 +317,10 @@ class OptionsTabPage(DirectFrame):
messenger.send('wakeup') messenger.send('wakeup')
if base.localAvatar.acceptingNewFriends: if base.localAvatar.acceptingNewFriends:
base.localAvatar.acceptingNewFriends = 0 base.localAvatar.acceptingNewFriends = 0
base.settings.updateSetting('accepting-new-friends', 0) base.settings.updateSetting('accepting-new-friends', False)
else: else:
base.localAvatar.acceptingNewFriends = 1 base.localAvatar.acceptingNewFriends = 1
base.settings.updateSetting('accepting-new-friends', 1) base.settings.updateSetting('accepting-new-friends', True)
self.settingsChanged = 1 self.settingsChanged = 1
self.__setAcceptFriendsButton() self.__setAcceptFriendsButton()
@ -328,10 +328,10 @@ class OptionsTabPage(DirectFrame):
messenger.send('wakeup') messenger.send('wakeup')
if base.localAvatar.acceptingNonFriendWhispers: if base.localAvatar.acceptingNonFriendWhispers:
base.localAvatar.acceptingNonFriendWhispers = 0 base.localAvatar.acceptingNonFriendWhispers = 0
base.settings.updateSetting('accepting-non-friend-whispers', 0) base.settings.updateSetting('accepting-non-friend-whispers', False)
else: else:
base.localAvatar.acceptingNonFriendWhispers = 1 base.localAvatar.acceptingNonFriendWhispers = 1
base.settings.updateSetting('accepting-non-friend-whispers', 1) base.settings.updateSetting('accepting-non-friend-whispers', True)
self.settingsChanged = 1 self.settingsChanged = 1
self.__setAcceptWhispersButton() self.__setAcceptWhispersButton()

4
toontown/toon/LocalToon.py
View file

@ -162,8 +162,8 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar):
if not hasattr(base.cr, 'lastLoggedIn'): if not hasattr(base.cr, 'lastLoggedIn'):
base.cr.lastLoggedIn = self.cr.toontownTimeManager.convertStrToToontownTime('') base.cr.lastLoggedIn = self.cr.toontownTimeManager.convertStrToToontownTime('')
self.setLastTimeReadNews(base.cr.lastLoggedIn) self.setLastTimeReadNews(base.cr.lastLoggedIn)
self.acceptingNewFriends = base.settings.getSetting('accepting-new-friends', 1) and base.config.GetBool('accepting-new-friends-default', True) self.acceptingNewFriends = base.settings.getSetting('accepting-new-friends', True) and base.config.GetBool('accepting-new-friends-default', True)
self.acceptingNonFriendWhispers = base.settings.getSetting('accepting-non-friend-whispers', 1) and base.config.GetBool('accepting-non-friend-whispers-default', True) self.acceptingNonFriendWhispers = base.settings.getSetting('accepting-non-friend-whispers', True) and base.config.GetBool('accepting-non-friend-whispers-default', True)
self.physControls.event.addAgainPattern('again%in') self.physControls.event.addAgainPattern('again%in')
self.oldPos = None self.oldPos = None
self.questMap = None self.questMap = None

10
toontown/toonbase/DisplayOptions.py
View file

@ -22,12 +22,12 @@ class DisplayOptions:
def loadFromSettings(self): def loadFromSettings(self):
base.settings.readSettings() base.settings.readSettings()
mode = not base.settings.getSetting('windowed-mode', 1) mode = not base.settings.getSetting('windowed-mode', True)
music = base.settings.getSetting('music', 1) music = base.settings.getSetting('music', True)
sfx = base.settings.getSetting('sfx', 1) sfx = base.settings.getSetting('sfx', True)
toonChatSounds = base.settings.getSetting('toon-chat-sounds', 1) toonChatSounds = base.settings.getSetting('toon-chat-sounds', True)
res = base.settings.getSetting('resolution', (800, 600)) res = base.settings.getSetting('resolution', (800, 600))
embed = base.settings.getSetting('embedded-mode', 0) embed = base.settings.getSetting('embedded-mode', False)
self.notify.debug('before prc settings embedded mode=%s' % str(embed)) self.notify.debug('before prc settings embedded mode=%s' % str(embed))
self.notify.debug('before prc settings full screen mode=%s' % str(mode)) self.notify.debug('before prc settings full screen mode=%s' % str(mode))
if mode == None: if mode == None:

8
toontown/toonbase/ToonBase.py
View file

@ -25,10 +25,10 @@ class ToonBase(OTPBase.OTPBase):
self.settings = Settings() self.settings = Settings()
if not config.GetInt('ignore-user-options', 0): if not config.GetInt('ignore-user-options', 0):
self.settings.readSettings() self.settings.readSettings()
mode = not self.settings.getSetting('windowed-mode', 1) mode = not self.settings.getSetting('windowed-mode', True)
music = self.settings.getSetting('music', 1) music = self.settings.getSetting('music', True)
sfx = self.settings.getSetting('sfx', 1) sfx = self.settings.getSetting('sfx', True)
toonChatSounds = self.settings.getSetting('toon-chat-sounds', 1) toonChatSounds = self.settings.getSetting('toon-chat-sounds', True)
res = self.settings.getSetting('resolution', (800, 600)) res = self.settings.getSetting('resolution', (800, 600))
if mode == None: if mode == None:
mode = 1 mode = 1