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

general: last of the cleanup for now

Browse source
This commit is contained in:
John Cote 2019-11-17 18:51:35 -05:00
parent bab8474cb9
commit 8e34a96b7e
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
otp/distributed/OTPClientRepository.py
View file

@ -1039,6 +1039,30 @@ class OTPClientRepository(ClientRepositoryBase):
self.loginFSM.request('shutdown') self.loginFSM.request('shutdown')
return return
if config.GetBool('astron-support', True):
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
def handleAvatarListResponse(self, avatarList):
avList = []
for avNum, avName, avDNA, avPosition, nameState in avatarList:
avNames = ['',
'',
'',
'']
avNames[0] = avName
if nameState == 2: # Pending
avNames[1] = avName
elif nameState == 3: # Approved
avNames[2] = avName
elif nameState == 4: # Rejected
avNames[3] = avName
aname = int(nameState == 1)
potAv = PotentialAvatar(avNum, avNames, avDNA, avPosition, aname)
avList.append(potAv)
self.avList = avList
self.loginFSM.request('chooseAvatar', [self.avList])
@report(types=['args', 'deltaStamp'], dConfigParam='teleport') @report(types=['args', 'deltaStamp'], dConfigParam='teleport')
def enterChooseAvatar(self, avList): def enterChooseAvatar(self, avList):
pass pass
@ -2448,29 +2472,6 @@ class OTPClientRepository(ClientRepositoryBase):
distObj = self.generateWithRequiredOtherFields(dclass, doId, di, parentId, zoneId) distObj = self.generateWithRequiredOtherFields(dclass, doId, di, parentId, zoneId)
dclass.stopGenerate() dclass.stopGenerate()
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
def handleAvatarListResponse(self, avatarList):
avList = []
for avNum, avName, avDNA, avPosition, nameState in avatarList:
avNames = ['',
'',
'',
'']
avNames[0] = avName
if nameState == 2: # Pending
avNames[1] = avName
elif nameState == 3: # Approved
avNames[2] = avName
elif nameState == 4: # Rejected
avNames[3] = avName
aname = int(nameState == 1)
potAv = PotentialAvatar(avNum, avNames, avDNA, avPosition, aname)
avList.append(potAv)
self.avList = avList
self.loginFSM.request('chooseAvatar', [self.avList])
def handleDisable(self, di, ownerView = False): def handleDisable(self, di, ownerView = False):
doId = di.getUint32() doId = di.getUint32()
if not self.isLocalId(doId): if not self.isLocalId(doId):

1
toontown/shtiker/IssueFrame.py
View file

@ -35,6 +35,7 @@ class IssueFrame(DirectFrame):
DirectFrame.__init__(self, frameColor=(1, 1, 1, 0), frameSize=self.FrameDimensions, relief=DGG.FLAT, parent=parent) DirectFrame.__init__(self, frameColor=(1, 1, 1, 0), frameSize=self.FrameDimensions, relief=DGG.FLAT, parent=parent)
self.hide() self.hide()
self.accept('newsSnapshot', self.doSnapshot) self.accept('newsSnapshot', self.doSnapshot)
self._parent = parent
self.newsDir = newsDir self.newsDir = newsDir
self.dateStr = dateStr self.dateStr = dateStr
self.myIssueIndex = myIssueIndex self.myIssueIndex = myIssueIndex