toon: Probably the last Disney hack check removal
This commit is contained in:
parent
4c48955ce0
commit
cfa209216c
5 changed files with 0 additions and 47 deletions
|
@ -112,8 +112,6 @@ dclass TimeManager : DistributedObject {
|
||||||
checkForGarbageLeaks(bool) airecv clsend;
|
checkForGarbageLeaks(bool) airecv clsend;
|
||||||
setNumAIGarbageLeaks(uint32);
|
setNumAIGarbageLeaks(uint32);
|
||||||
setClientGarbageLeak(uint32, string(0-1024)) airecv clsend;
|
setClientGarbageLeak(uint32, string(0-1024)) airecv clsend;
|
||||||
checkAvOnDistrict(uint32, DoId) clsend airecv;
|
|
||||||
checkAvOnDistrictResult(uint32, DoId, bool);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
dclass ObjectServer {
|
dclass ObjectServer {
|
||||||
|
|
|
@ -341,11 +341,3 @@ class TimeManager(DistributedObject.DistributedObject):
|
||||||
|
|
||||||
self.notify.debug('getMacOsInfo returning %s' % str(result))
|
self.notify.debug('getMacOsInfo returning %s' % str(result))
|
||||||
return 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)
|
|
||||||
|
|
|
@ -133,9 +133,3 @@ class DistributedNPCToonBase(DistributedToon.DistributedToon):
|
||||||
|
|
||||||
def setPositionIndex(self, posIndex):
|
def setPositionIndex(self, posIndex):
|
||||||
self.posIndex = posIndex
|
self.posIndex = posIndex
|
||||||
|
|
||||||
def _startZombieCheck(self):
|
|
||||||
pass
|
|
||||||
|
|
||||||
def _stopZombieCheck(self):
|
|
||||||
pass
|
|
||||||
|
|
|
@ -185,7 +185,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
|
||||||
self.gmNameTagEnabled = 0
|
self.gmNameTagEnabled = 0
|
||||||
self.gmNameTagColor = 'whiteGM'
|
self.gmNameTagColor = 'whiteGM'
|
||||||
self.gmNameTagString = ''
|
self.gmNameTagString = ''
|
||||||
self._lastZombieContext = None
|
|
||||||
self.transitioning = False
|
self.transitioning = False
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -194,7 +193,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
|
||||||
soundSequence.finish()
|
soundSequence.finish()
|
||||||
|
|
||||||
self.soundSequenceList = []
|
self.soundSequenceList = []
|
||||||
self._stopZombieCheck()
|
|
||||||
if self.boardingParty:
|
if self.boardingParty:
|
||||||
self.boardingParty.demandDrop()
|
self.boardingParty.demandDrop()
|
||||||
self.boardingParty = None
|
self.boardingParty = None
|
||||||
|
@ -256,7 +254,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
|
||||||
DistributedPlayer.DistributedPlayer.announceGenerate(self)
|
DistributedPlayer.DistributedPlayer.announceGenerate(self)
|
||||||
if self.animFSM.getCurrentState().getName() == 'off':
|
if self.animFSM.getCurrentState().getName() == 'off':
|
||||||
self.setAnimState('neutral')
|
self.setAnimState('neutral')
|
||||||
self._startZombieCheck()
|
|
||||||
|
|
||||||
def _handleClientCleanup(self):
|
def _handleClientCleanup(self):
|
||||||
if self.track != None:
|
if self.track != None:
|
||||||
|
@ -2590,27 +2587,5 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
|
||||||
self.gmIcon.detachNode()
|
self.gmIcon.detachNode()
|
||||||
del self.gmIcon
|
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):
|
def getTransitioning(self):
|
||||||
return self.transitioning
|
return self.transitioning
|
||||||
|
|
|
@ -1934,9 +1934,3 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar):
|
||||||
def stopQuestMap(self):
|
def stopQuestMap(self):
|
||||||
if self.questMap:
|
if self.questMap:
|
||||||
self.questMap.stop()
|
self.questMap.stop()
|
||||||
|
|
||||||
def _startZombieCheck(self):
|
|
||||||
pass
|
|
||||||
|
|
||||||
def _stopZombieCheck(self):
|
|
||||||
pass
|
|
||||||
|
|
Loading…
Reference in a new issue