TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 11:28:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

check zone on setZoneComplete

Browse Source
This commit is contained in:
Darren Ranalli 2003-12-05 02:19:25 +00:00
parent 3f03bf96d0
commit 5d12b46a9f
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
direct/src/level/DistributedLevel.py
View File

@ -1,6 +1,7 @@
"""DistributedLevel.py: contains the DistributedLevel class""" """DistributedLevel.py: contains the DistributedLevel class"""
from ClockDelta import * from ClockDelta import *
from PandaModules import *
from PythonUtil import Functor, sameElements, list2dict, uniqueElements from PythonUtil import Functor, sameElements, list2dict, uniqueElements
from IntervalGlobal import * from IntervalGlobal import *
from ToontownMsgTypes import * from ToontownMsgTypes import *
@ -409,7 +410,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
try: try:
zoneNum = int(name[prefixLen:]) zoneNum = int(name[prefixLen:])
except: except:
DistributedLevel.notify.debug( DistributedLevel.notify.warning(
'Invalid zone floor collision node: %s' 'Invalid zone floor collision node: %s'
% name) % name)
else: else:
@ -447,9 +448,17 @@ class DistributedLevel(DistributedObject.DistributedObject,
def handleDatagram(self, msgType, di): def handleDatagram(self, msgType, di):
if msgType == CLIENT_DONE_SET_ZONE_RESP: if msgType == CLIENT_DONE_SET_ZONE_RESP:
print 'setZone %s complete' % self.setZonesReceived # snoop to see what zone we're talking about
messenger.send(self.getSetZoneCompleteEvent(self.setZonesReceived)) di2 = DatagramIterator(di)
self.setZonesReceived += 1 zone = di2.getUint32()
if zone != self.levelZone:
self.notify.warning('got setZoneComplete for unknown zone %s' %
zone)
else:
print 'setZone %s complete' % self.setZonesReceived
messenger.send(self.getSetZoneCompleteEvent(
self.setZonesReceived))
self.setZonesReceived += 1
if self.oldTcrHandler is None: if self.oldTcrHandler is None:
toonbase.tcr.handleUnexpectedMsgType(msgType, di) toonbase.tcr.handleUnexpectedMsgType(msgType, di)
@ -465,7 +474,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
a zone. a zone.
See camEnterZone() See camEnterZone()
""" """
DistributedLevel.notify.debug('toonEnterZone%s' % zoneNum) DistributedLevel.notify.info('toonEnterZone%s' % zoneNum)
if zoneNum != self.lastToonZone: if zoneNum != self.lastToonZone:
self.lastToonZone = zoneNum self.lastToonZone = zoneNum
@ -480,7 +489,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
a zone. a zone.
See toonEnterZone() See toonEnterZone()
""" """
DistributedLevel.notify.debug('camEnterZone%s' % zoneNum) DistributedLevel.notify.info('camEnterZone%s' % zoneNum)
self.enterZone(zoneNum) self.enterZone(zoneNum)
if zoneNum != self.lastCamZone: if zoneNum != self.lastCamZone:
@ -489,7 +498,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
self.spawnTitleText() self.spawnTitleText()
def enterZone(self, zoneNum): def enterZone(self, zoneNum):
DistributedLevel.notify.debug("entering zone %s" % zoneNum) DistributedLevel.notify.info("entering zone %s" % zoneNum)
if not DistributedLevel.WantVisibility: if not DistributedLevel.WantVisibility:
return return
@ -537,10 +546,10 @@ class DistributedLevel(DistributedObject.DistributedObject,
else: else:
removedZoneNums.append(vz) removedZoneNums.append(vz)
# show the new, hide the old # show the new, hide the old
DistributedLevel.notify.debug('showing zones %s' % addedZoneNums) DistributedLevel.notify.info('showing zones %s' % addedZoneNums)
for az in addedZoneNums: for az in addedZoneNums:
self.showZone(az) self.showZone(az)
DistributedLevel.notify.debug('hiding zones %s' % removedZoneNums) DistributedLevel.notify.info('hiding zones %s' % removedZoneNums)
for rz in removedZoneNums: for rz in removedZoneNums:
self.hideZone(rz) self.hideZone(rz)
@ -562,7 +571,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
for vz in vizList: for vz in vizList:
visibleZoneIds.append(self.getZoneId(zoneNum=vz)) visibleZoneIds.append(self.getZoneId(zoneNum=vz))
assert(uniqueElements(visibleZoneIds)) assert(uniqueElements(visibleZoneIds))
DistributedLevel.notify.debug('new viz list: %s' % visibleZoneIds) DistributedLevel.notify.info('new viz list: %s' % visibleZoneIds)
toonbase.tcr.sendSetZoneMsg(self.levelZone, visibleZoneIds) toonbase.tcr.sendSetZoneMsg(self.levelZone, visibleZoneIds)