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

toon: Probably the last Disney hack check removal

Browse source
This commit is contained in:
John Cote 2021-07-07 19:17:19 -04:00
parent 4c48955ce0
commit cfa209216c
No known key found for this signature in database
GPG key ID: E3442FF71E9C1C01
5 changed files with 0 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/otp.dc
View file

@ -112,8 +112,6 @@ dclass TimeManager : DistributedObject {
checkForGarbageLeaks(bool) airecv clsend;
setNumAIGarbageLeaks(uint32);
setClientGarbageLeak(uint32, string(0-1024)) airecv clsend;
checkAvOnDistrict(uint32, DoId) clsend airecv;
checkAvOnDistrictResult(uint32, DoId, bool);
};
dclass ObjectServer {

8
otp/ai/TimeManager.py
View file

@ -341,11 +341,3 @@ class TimeManager(DistributedObject.DistributedObject):
self.notify.debug('getMacOsInfo returning %s' % str(result))
return result
def checkAvOnDistrict(self, av, context):
self.sendUpdate('checkAvOnDistrict', [context, av.doId])
def checkAvOnDistrictResult(self, context, avId, present):
av = self.cr.getDo(avId)
if av:
av._zombieCheckResult(context, present)

6
toontown/toon/DistributedNPCToonBase.py
View file

@ -133,9 +133,3 @@ class DistributedNPCToonBase(DistributedToon.DistributedToon):
def setPositionIndex(self, posIndex):
self.posIndex = posIndex
def _startZombieCheck(self):
pass
def _stopZombieCheck(self):
pass

25
toontown/toon/DistributedToon.py
View file

@ -185,7 +185,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
self.gmNameTagEnabled = 0
self.gmNameTagColor = 'whiteGM'
self.gmNameTagString = ''
self._lastZombieContext = None
self.transitioning = False
return
@ -194,7 +193,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
soundSequence.finish()
self.soundSequenceList = []
self._stopZombieCheck()
if self.boardingParty:
self.boardingParty.demandDrop()
self.boardingParty = None
@ -256,7 +254,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
DistributedPlayer.DistributedPlayer.announceGenerate(self)
if self.animFSM.getCurrentState().getName() == 'off':
self.setAnimState('neutral')
self._startZombieCheck()
def _handleClientCleanup(self):
if self.track != None:
@ -2590,27 +2587,5 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
self.gmIcon.detachNode()
del self.gmIcon
def _startZombieCheck(self):
self._zombieCheckSerialGen = SerialNumGen(random.randrange(1 << 31))
taskMgr.doMethodLater(2.0 + 60.0 * random.random(), self._doZombieCheck, self._getZombieCheckTaskName())
def _stopZombieCheck(self):
taskMgr.remove(self._getZombieCheckTaskName())
def _getZombieCheckTaskName(self):
return self.uniqueName('zombieCheck')
def _doZombieCheck(self, task = None):
self._lastZombieContext = self._zombieCheckSerialGen.next()
self.cr.timeManager.checkAvOnDistrict(self, self._lastZombieContext)
taskMgr.doMethodLater(60.0, self._doZombieCheck, self._getZombieCheckTaskName())
def _zombieCheckResult(self, context, present):
if context == self._lastZombieContext:
print('_zombieCheckResult[%s]: %s' % (self.doId, present))
if not present:
self.notify.warning('hiding av %s because they are not on the district!' % self.doId)
self.setParent(OTPGlobals.SPHidden)
def getTransitioning(self):
return self.transitioning

6
toontown/toon/LocalToon.py
View file

@ -1934,9 +1934,3 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar):
def stopQuestMap(self):
if self.questMap:
self.questMap.stop()
def _startZombieCheck(self):
pass
def _stopZombieCheck(self):
pass