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

Some more true friends work (commited before git reset)

Browse source
This commit is contained in:
DenialMC 2015-04-07 22:31:53 +03:00
parent 55c8214743
commit 7cfa2866b9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
otp/avatar/Avatar.py
View file

@ -389,7 +389,7 @@ class Avatar(Actor, ShadowCaster):
pass
def displayTalk(self, chatString):
if not base.cr.avatarFriendsManager.checkIgnored(self.doId):
if not base.localAvatar.isIgnored(self.doId):
self.clearChat()
self.nametag.setChatType(NametagGlobals.CHAT)
self.nametag.setChatButton(NametagGlobals.noButton)

6
toontown/friends/ToontownFriendSecret.py
View file

@ -79,7 +79,7 @@ class ToontownFriendSecret(DirectFrame):
self.cancel.hide()
self.nextText = DirectLabel(parent=self, relief=None, pos=(0, 0, 0.3), scale=0.06, text='', text_scale=TTLocalizer.FSnextText, text_fg=(0, 0, 0, 1), text_wordwrap=25.5)
self.nextText.hide()
self.secretText = DirectLabel(parent=self, relief=None, pos=(0, 0, -0.42), scale=0.05, text='', text_fg=(0, 0, 0, 1), text_wordwrap=30)
self.secretText = DirectLabel(parent=self, relief=None, pos=(0, 0, -0.42), scale=0.08, text='', text_fg=(0, 0, 0, 1), text_wordwrap=30)
self.secretText.hide()
guiButton.removeNode()
@ -124,7 +124,7 @@ class ToontownFriendSecret(DirectFrame):
if id == 0:
self.rejectGetSecret(TTLocalizer.FriendSecretNoServer)
elif id == 1:
self.rejectGetSecret(TTLocalizer.FriendSecretNoServerResponse if result1 is None else result1)
self.rejectGetSecret(TTLocalizer.FriendSecretNoServerResponse if not result1 else result1)
elif id == 2:
self.successGetSecret(result1, result2)
@ -167,7 +167,7 @@ class ToontownFriendSecret(DirectFrame):
if id == 0:
self.nextText['text'] = TTLocalizer.FriendSecretNoServer
elif id == 1:
self.nextText['text'] = TTLocalizer.FriendSecretNoServerResponse if result1 is None else result1
self.nextText['text'] = TTLocalizer.FriendSecretNoServerResponse if not result1 else result1
elif id == 2:
self.nextText['text'] = TTLocalizer.FriendSecretEnteredCodeSelf
elif id == 3: