Explorar el Código

bug fix, use self.editMgrEntity

Darren Ranalli hace 22 años
padre
commit
495833ca01
Se han modificado 2 ficheros con 13 adiciones y 15 borrados
  1. 1 3
      direct/src/level/DistributedLevelAI.py
  2. 12 12
      direct/src/level/Level.py

+ 1 - 3
direct/src/level/DistributedLevelAI.py

@@ -61,9 +61,7 @@ class DistributedLevelAI(DistributedObjectAI.DistributedObjectAI,
 
 
         if __debug__:
         if __debug__:
             # listen for requests to save the spec
             # listen for requests to save the spec
-            editMgrEntId = self.entType2ids['editMgr'][0]
-            editMgr = self.getEntity(editMgrEntId)
-            self.accept(editMgr.getSpecSaveEvent(), self.saveSpec)
+            self.accept(self.editMgrEntity.getSpecSaveEvent(), self.saveSpec)
 
 
     def createEntityCreator(self):
     def createEntityCreator(self):
         """Create the object that will be used to create Entities.
         """Create the object that will be used to create Entities.

+ 12 - 12
direct/src/level/Level.py

@@ -52,31 +52,31 @@ class Level:
         self.entType2ids = self.levelSpec.getEntType2ids(
         self.entType2ids = self.levelSpec.getEntType2ids(
             self.levelSpec.getAllEntIds())
             self.levelSpec.getAllEntIds())
 
 
+        # this list contains the entIds of entities that we have actually
+        # created, in order of creation
+        self.createdEntIds = []
+
+        # get an entity creator object
+        self.entityCreator = self.createEntityCreator()
+        # create all the entities
+        # TODO: maybe we should leave this to a subclass or the level user
+        self.createAllEntities(priorityTypes=['levelMgr','zone'])
+
         # there should be one and only one levelMgr
         # there should be one and only one levelMgr
         assert len(self.entType2ids['levelMgr']) == 1
         assert len(self.entType2ids['levelMgr']) == 1
-        self.levelMgrEntity = self.entType2ids['levelMgr'][0]
+        self.levelMgrEntity = self.getEntity(self.entType2ids['levelMgr'][0])
         assert self.levelMgrEntity.entId == LevelConstants.LevelMgrEntId
         assert self.levelMgrEntity.entId == LevelConstants.LevelMgrEntId
 
 
         if __debug__:
         if __debug__:
             # there should be one and only one editMgr
             # there should be one and only one editMgr
             assert len(self.entType2ids['editMgr']) == 1
             assert len(self.entType2ids['editMgr']) == 1
-            self.editMgrEntity = self.entType2ids['editMgr'][0]
+            self.editMgrEntity = self.getEntity(self.entType2ids['editMgr'][0])
             assert self.editMgrEntity.entId == LevelConstants.EditMgrEntId
             assert self.editMgrEntity.entId == LevelConstants.EditMgrEntId
 
 
         # make sure the uberzone is there
         # make sure the uberzone is there
         assert LevelConstants.UberZoneEntId in self.entType2ids['zone']
         assert LevelConstants.UberZoneEntId in self.entType2ids['zone']
         self.UberZoneEntity = self.getEntity(LevelConstants.UberZoneEntId)
         self.UberZoneEntity = self.getEntity(LevelConstants.UberZoneEntId)
 
 
-        # this list contains the entIds of entities that we have actually
-        # created, in order of creation
-        self.createdEntIds = []
-
-        # get an entity creator object
-        self.entityCreator = self.createEntityCreator()
-        # create all the entities
-        # TODO: maybe we should leave this to a subclass or the level user
-        self.createAllEntities(priorityTypes=['levelMgr','zone'])
-
         self.initialized = 1
         self.initialized = 1
 
 
     def isInitialized(self):
     def isInitialized(self):