diff --git a/direct/src/level/DistributedLevelAI.py b/direct/src/level/DistributedLevelAI.py index 3c548d61fa..480b79ce09 100755 --- a/direct/src/level/DistributedLevelAI.py +++ b/direct/src/level/DistributedLevelAI.py @@ -38,6 +38,7 @@ class DistributedLevelAI(DistributedObjectAI.DistributedObjectAI, self.initializeLevel(levelSpec) + # self.zoneIds comes from LevelMgrAI self.sendUpdate('setZoneIds', [self.zoneIds]) self.sendUpdate('setStartTimestamp', [self.startTimestamp]) # this is no longer used @@ -57,13 +58,14 @@ class DistributedLevelAI(DistributedObjectAI.DistributedObjectAI, def getEntranceId(self): return self.entranceId - def delete(self): + def delete(self, deAllocZone=True): self.notify.debug('delete') if __dev__: self.removeAutosaveTask() self.destroyLevel() self.ignoreAll() - self.air.deallocateZone(self.zoneId) + if deAllocZone: + self.air.deallocateZone(self.zoneId) DistributedObjectAI.DistributedObjectAI.delete(self) def initializeLevel(self, levelSpec): diff --git a/direct/src/level/SpecUtil.py b/direct/src/level/SpecUtil.py index c4dfd20ecf..b754a925fa 100755 --- a/direct/src/level/SpecUtil.py +++ b/direct/src/level/SpecUtil.py @@ -10,7 +10,7 @@ import types """ TO CREATE A NEW SPEC: -import SpecUtil +from direct.level import SpecUtil from toontown.coghq import FactoryEntityTypes SpecUtil.makeNewSpec('$TOONTOWN/src/coghq/FactoryMockupSpec.py', 'phase_9/models/cogHQ/SelbotLegFactory', FactoryEntityTypes) """ @@ -27,13 +27,13 @@ def makeNewSpec(filename, modelPath, entTypeModule=EntityTypes): """ FOR SAME LEVEL MODEL PATH: -import SpecUtil +from direct.level import SpecUtil from toontown.coghq import SellbotLegFactorySpec from toontown.coghq import FactoryEntityTypes SpecUtil.updateSpec(SellbotLegFactorySpec, FactoryEntityTypes) FOR DIFFERENT LEVEL MODEL PATH: -import SpecUtil +from direct.level import SpecUtil from toontown.coghq import SellbotLegFactorySpec from toontown.coghq import FactoryEntityTypes SpecUtil.updateSpec(SellbotLegFactorySpec, FactoryEntityTypes, '/i/beta/toons/maya/work/CogHeadquarters/CogFactoriesInteriors/AllFactories/LegFactory/SelbotLegFactory_v##s#.mb')