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

login: login manager doesn't need doneEvent

Browse source
This commit is contained in:
John Cote 2019-12-02 19:44:19 -05:00
parent 1ed01e7746
commit b58d21c70e
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
otp/login/AstronLoginManager.py
View file

@ -7,11 +7,9 @@ class AstronLoginManager(DistributedObjectGlobal):
def __init__(self, cr): def __init__(self, cr):
DistributedObjectGlobal.__init__(self, cr) DistributedObjectGlobal.__init__(self, cr)
self.doneEvent = None
self._callback = None self._callback = None
def handleRequestLogin(self, doneEvent): def handleRequestLogin(self):
self.doneEvent = doneEvent
playToken = self.cr.playToken or 'dev' playToken = self.cr.playToken or 'dev'
self.sendRequestLogin(playToken) self.sendRequestLogin(playToken)

5
otp/login/LoginScreen.py
View file

@ -255,7 +255,7 @@ class LoginScreen(StateData.StateData, GuiScreen.GuiScreen):
def handleHelloResp(self): def handleHelloResp(self):
self.cr.startHeartbeat() self.cr.startHeartbeat()
self.cr.astronLoginManager.handleRequestLogin(self.doneEvent) self.cr.astronLoginManager.handleRequestLogin()
def getExtendedErrorMsg(self, errorString): def getExtendedErrorMsg(self, errorString):
prefix = 'Bad DC Version Compare' prefix = 'Bad DC Version Compare'
@ -591,8 +591,7 @@ class LoginScreen(StateData.StateData, GuiScreen.GuiScreen):
canChat = createFriendsWithChat == "YES" or createFriendsWithChat == "CODE" canChat = createFriendsWithChat == "YES" or createFriendsWithChat == "CODE"
self.cr.secretChatAllowed = canChat self.cr.secretChatAllowed = canChat
if base.logPrivateInfo: if base.logPrivateInfo:
self.notify.info( self.notify.info("CREATE_FRIENDS_WITH_CHAT from game server login: %s %s" % (createFriendsWithChat, canChat))
"CREATE_FRIENDS_WITH_CHAT from game server login: %s %s" % (createFriendsWithChat, canChat))
self.chatCodeCreationRule = responseData.get('chatCodeCreationRule') self.chatCodeCreationRule = responseData.get('chatCodeCreationRule')
self.cr.chatChatCodeCreationRule = self.chatCodeCreationRule self.cr.chatChatCodeCreationRule = self.chatCodeCreationRule
if base.logPrivateInfo: if base.logPrivateInfo: