From 495833ca0137a5cca20444d9d9821e716bad1979 Mon Sep 17 00:00:00 2001
From: Darren Ranalli <github@dranalli.com>
Date: Fri, 24 Oct 2003 01:01:45 +0000
Subject: [PATCH] bug fix, use self.editMgrEntity

---
 direct/src/level/DistributedLevelAI.py |  4 +---
 direct/src/level/Level.py              | 30 +++++++++++++-------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/direct/src/level/DistributedLevelAI.py b/direct/src/level/DistributedLevelAI.py
index 71a0dcb554..c6dcae7683 100755
--- a/direct/src/level/DistributedLevelAI.py
+++ b/direct/src/level/DistributedLevelAI.py
@@ -61,9 +61,7 @@ class DistributedLevelAI(DistributedObjectAI.DistributedObjectAI,
 
         if __debug__:
             # 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):
         """Create the object that will be used to create Entities.
diff --git a/direct/src/level/Level.py b/direct/src/level/Level.py
index c6d521819f..9752b54043 100755
--- a/direct/src/level/Level.py
+++ b/direct/src/level/Level.py
@@ -52,21 +52,6 @@ class Level:
         self.entType2ids = self.levelSpec.getEntType2ids(
             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
         # created, in order of creation
         self.createdEntIds = []
@@ -77,6 +62,21 @@ class Level:
         # 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
+        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
 
     def isInitialized(self):