Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

No warning

Browse source
This commit is contained in:
John 2015-06-18 17:13:18 +03:00
parent 884e452e32
commit bbea8f8541
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toontown/chat/ToontownChatManager.py
View file

@ -134,20 +134,24 @@ class ToontownChatManager(ChatManager.ChatManager):
return return
def enterNormalChat(self): def enterNormalChat(self):
if not settings['trueFriends'] and not settings['speedchatPlus']:
self.fsm.request('mainMenu')
return
result = ChatManager.ChatManager.enterNormalChat(self) result = ChatManager.ChatManager.enterNormalChat(self)
if result == None: if result == None:
self.notify.warning('something went wrong in enterNormalChat, falling back to main menu') self.notify.warning('something went wrong in enterNormalChat, falling back to main menu')
self.fsm.request('mainMenu') self.fsm.request('mainMenu')
return
def enterWhisperChat(self, avatarName, avatarId): def enterWhisperChat(self, avatarName, avatarId):
if not settings['trueFriends'] and not settings['speedchatPlus']:
self.fsm.request('mainMenu')
return
result = ChatManager.ChatManager.enterWhisperChat(self, avatarName, avatarId) result = ChatManager.ChatManager.enterWhisperChat(self, avatarName, avatarId)
self.chatInputNormal.reparentTo(base.a2dTopCenter) self.chatInputNormal.reparentTo(base.a2dTopCenter)
self.chatInputNormal.setPos(self.whisperPos) self.chatInputNormal.setPos(self.whisperPos)
if result == None: if result == None:
self.notify.warning('something went wrong in enterWhisperChat, falling back to main menu') self.notify.warning('something went wrong in enterWhisperChat, falling back to main menu')
self.fsm.request('mainMenu') self.fsm.request('mainMenu')
return
def enterNoSpeedchatPlus(self): def enterNoSpeedchatPlus(self):
if self.noSpeedchatPlus == None: if self.noSpeedchatPlus == None: