From 1b3acf63c1a1ce312535cf99b65077ecc37dfb86 Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Mon, 17 Nov 2003 04:17:49 +0000 Subject: [PATCH] don't keep internal editMgr attrib values in the spec -- avoid CVS merge conflicts --- direct/src/level/EditMgrAI.py | 7 +++++++ direct/src/level/EditMgrBase.py | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/direct/src/level/EditMgrAI.py b/direct/src/level/EditMgrAI.py index 136fb6f50e..adf2b40f76 100755 --- a/direct/src/level/EditMgrAI.py +++ b/direct/src/level/EditMgrAI.py @@ -30,7 +30,14 @@ class EditMgrAI(EditMgrBase.EditMgrBase): data.update({'entId': id}) self.level.setAttribChange(self.entId, 'insertEntity', data) + # clear out the attrib, it shouldn't be kept in the spec + self.level.levelSpec.doSetAttrib(self.entId, 'requestNewEntity', + None) + def getSpecSaveEvent(self): return 'requestSave-%s' % self.level.levelId def setRequestSave(self, data): messenger.send(self.getSpecSaveEvent()) + # clear out the attrib, it shouldn't be kept in the spec + self.level.levelSpec.doSetAttrib(self.entId, 'requestSave', + None) diff --git a/direct/src/level/EditMgrBase.py b/direct/src/level/EditMgrBase.py index 4d7616bab5..3edad9b63a 100755 --- a/direct/src/level/EditMgrBase.py +++ b/direct/src/level/EditMgrBase.py @@ -22,7 +22,13 @@ class EditMgrBase(Entity.Entity): data['entType'], data['parentEntId'], ) + # clear out the attrib, it shouldn't be kept in the spec + self.level.levelSpec.doSetAttrib(self.entId, 'insertEntity', + None) def setRemoveEntity(self, data): self.level.levelSpec.removeEntity(data['entId'], ) + # clear out the attrib, it shouldn't be kept in the spec + self.level.levelSpec.doSetAttrib(self.entId, 'removeEntity', + None)