TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't send scenario index; it's always zero

Browse Source
This commit is contained in:
Darren Ranalli 2004-11-18 00:02:37 +00:00
parent 0b34d0deb6
commit d0101e74ef
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
) )
self.zonesEnteredList = [] self.zonesEnteredList = []
self.fColorZones = 0 self.fColorZones = 0
self.scenarioIndex = 0
def generate(self): def generate(self):
DistributedLevel.notify.debug('generate') DistributedLevel.notify.debug('generate')
@ -118,6 +119,15 @@ class DistributedLevel(DistributedObject.DistributedObject,
DistributedLevel.notify.debug('setStartTimestamp: %s' % timestamp) DistributedLevel.notify.debug('setStartTimestamp: %s' % timestamp)
self.startTime = globalClockDelta.networkToLocalTime(timestamp,bits=32) self.startTime = globalClockDelta.networkToLocalTime(timestamp,bits=32)
# ugly hack: we treat a few DC fields as if they were required,
# and use 'levelAnnounceGenerate()' in place of regular old
# announceGenerate(). Note that we have to call
# gotAllRequired() in the last 'faux-required' DC update
# handler. If you add another field, move this to the last one.
self.privGotAllRequired()
"""
# this is no longer used
def setScenarioIndex(self, scenarioIndex): def setScenarioIndex(self, scenarioIndex):
self.scenarioIndex = scenarioIndex self.scenarioIndex = scenarioIndex
@ -127,6 +137,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
# gotAllRequired() in the last 'faux-required' DC update # gotAllRequired() in the last 'faux-required' DC update
# handler. If you add another field, move this to the last one. # handler. If you add another field, move this to the last one.
self.privGotAllRequired() self.privGotAllRequired()
"""
def privGotAllRequired(self): def privGotAllRequired(self):
self.levelAnnounceGenerate() self.levelAnnounceGenerate()

5
direct/src/level/DistributedLevelAI.py
View File

@ -40,7 +40,10 @@ class DistributedLevelAI(DistributedObjectAI.DistributedObjectAI,
self.sendUpdate('setZoneIds', [self.zoneIds]) self.sendUpdate('setZoneIds', [self.zoneIds])
self.sendUpdate('setStartTimestamp', [self.startTimestamp]) self.sendUpdate('setStartTimestamp', [self.startTimestamp])
self.sendUpdate('setScenarioIndex', [self.scenarioIndex]) # this is no longer used
#self.sendUpdate('setScenarioIndex', [self.scenarioIndex])
if __dev__:
assert self.scenarioIndex == 0
def getLevelZoneId(self): def getLevelZoneId(self):
"""no entities should be generated in the level's zone; it causes """no entities should be generated in the level's zone; it causes