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

bug fix, use self.editMgrEntity

Browse Source
This commit is contained in:
Darren Ranalli 2003-10-24 01:01:45 +00:00
parent 067204e92c
commit 495833ca01
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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] self.accept(self.editMgrEntity.getSpecSaveEvent(), self.saveSpec)
editMgr = self.getEntity(editMgrEntId)
self.accept(editMgr.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.

30
direct/src/level/Level.py
View File

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