Browse Source

prelim DistributedMint

Darren Ranalli 21 years ago
parent
commit
707c0f22ba
2 changed files with 7 additions and 5 deletions
  1. 4 2
      direct/src/level/DistributedLevelAI.py
  2. 3 3
      direct/src/level/SpecUtil.py

+ 4 - 2
direct/src/level/DistributedLevelAI.py

@@ -38,6 +38,7 @@ class DistributedLevelAI(DistributedObjectAI.DistributedObjectAI,
 
 
         self.initializeLevel(levelSpec)
         self.initializeLevel(levelSpec)
 
 
+        # self.zoneIds comes from LevelMgrAI
         self.sendUpdate('setZoneIds', [self.zoneIds])
         self.sendUpdate('setZoneIds', [self.zoneIds])
         self.sendUpdate('setStartTimestamp', [self.startTimestamp])
         self.sendUpdate('setStartTimestamp', [self.startTimestamp])
         # this is no longer used
         # this is no longer used
@@ -57,13 +58,14 @@ class DistributedLevelAI(DistributedObjectAI.DistributedObjectAI,
     def getEntranceId(self):
     def getEntranceId(self):
         return self.entranceId
         return self.entranceId
 
 
-    def delete(self):
+    def delete(self, deAllocZone=True):
         self.notify.debug('delete')
         self.notify.debug('delete')
         if __dev__:
         if __dev__:
             self.removeAutosaveTask()
             self.removeAutosaveTask()
         self.destroyLevel()
         self.destroyLevel()
         self.ignoreAll()
         self.ignoreAll()
-        self.air.deallocateZone(self.zoneId)
+        if deAllocZone:
+            self.air.deallocateZone(self.zoneId)
         DistributedObjectAI.DistributedObjectAI.delete(self)
         DistributedObjectAI.DistributedObjectAI.delete(self)
 
 
     def initializeLevel(self, levelSpec):
     def initializeLevel(self, levelSpec):

+ 3 - 3
direct/src/level/SpecUtil.py

@@ -10,7 +10,7 @@ import types
 
 
 """
 """
 TO CREATE A NEW SPEC:
 TO CREATE A NEW SPEC:
-import SpecUtil
+from direct.level import SpecUtil
 from toontown.coghq import FactoryEntityTypes
 from toontown.coghq import FactoryEntityTypes
 SpecUtil.makeNewSpec('$TOONTOWN/src/coghq/FactoryMockupSpec.py', 'phase_9/models/cogHQ/SelbotLegFactory', 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:
 FOR SAME LEVEL MODEL PATH:
-import SpecUtil
+from direct.level import SpecUtil
 from toontown.coghq import SellbotLegFactorySpec
 from toontown.coghq import SellbotLegFactorySpec
 from toontown.coghq import FactoryEntityTypes
 from toontown.coghq import FactoryEntityTypes
 SpecUtil.updateSpec(SellbotLegFactorySpec, FactoryEntityTypes)
 SpecUtil.updateSpec(SellbotLegFactorySpec, FactoryEntityTypes)
 
 
 FOR DIFFERENT LEVEL MODEL PATH:
 FOR DIFFERENT LEVEL MODEL PATH:
-import SpecUtil
+from direct.level import SpecUtil
 from toontown.coghq import SellbotLegFactorySpec
 from toontown.coghq import SellbotLegFactorySpec
 from toontown.coghq import FactoryEntityTypes
 from toontown.coghq import FactoryEntityTypes
 SpecUtil.updateSpec(SellbotLegFactorySpec, FactoryEntityTypes, '/i/beta/toons/maya/work/CogHeadquarters/CogFactoriesInteriors/AllFactories/LegFactory/SelbotLegFactory_v##s#.mb')
 SpecUtil.updateSpec(SellbotLegFactorySpec, FactoryEntityTypes, '/i/beta/toons/maya/work/CogHeadquarters/CogFactoriesInteriors/AllFactories/LegFactory/SelbotLegFactory_v##s#.mb')