From d0101e74eff1f0e978cba45a93dac057766490e8 Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Thu, 18 Nov 2004 00:02:37 +0000 Subject: [PATCH] don't send scenario index; it's always zero --- direct/src/level/DistributedLevel.py | 11 +++++++++++ direct/src/level/DistributedLevelAI.py | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/direct/src/level/DistributedLevel.py b/direct/src/level/DistributedLevel.py index c7c912b4bf..2348b9ea70 100755 --- a/direct/src/level/DistributedLevel.py +++ b/direct/src/level/DistributedLevel.py @@ -63,6 +63,7 @@ class DistributedLevel(DistributedObject.DistributedObject, ) self.zonesEnteredList = [] self.fColorZones = 0 + self.scenarioIndex = 0 def generate(self): DistributedLevel.notify.debug('generate') @@ -118,6 +119,15 @@ class DistributedLevel(DistributedObject.DistributedObject, DistributedLevel.notify.debug('setStartTimestamp: %s' % timestamp) 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): self.scenarioIndex = scenarioIndex @@ -127,6 +137,7 @@ class DistributedLevel(DistributedObject.DistributedObject, # gotAllRequired() in the last 'faux-required' DC update # handler. If you add another field, move this to the last one. self.privGotAllRequired() + """ def privGotAllRequired(self): self.levelAnnounceGenerate() diff --git a/direct/src/level/DistributedLevelAI.py b/direct/src/level/DistributedLevelAI.py index eb713ea69b..3c548d61fa 100755 --- a/direct/src/level/DistributedLevelAI.py +++ b/direct/src/level/DistributedLevelAI.py @@ -40,7 +40,10 @@ class DistributedLevelAI(DistributedObjectAI.DistributedObjectAI, self.sendUpdate('setZoneIds', [self.zoneIds]) 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): """no entities should be generated in the level's zone; it causes