TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't keep internal editMgr attrib values in the spec -- avoid CVS merge conflicts

Browse Source
This commit is contained in:
Darren Ranalli 2003-11-17 04:17:49 +00:00
parent c9113efb32
commit 1b3acf63c1
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
direct/src/level/EditMgrAI.py
View File

@ -30,7 +30,14 @@ class EditMgrAI(EditMgrBase.EditMgrBase):
data.update({'entId': id}) data.update({'entId': id})
self.level.setAttribChange(self.entId, 'insertEntity', data) 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): def getSpecSaveEvent(self):
return 'requestSave-%s' % self.level.levelId return 'requestSave-%s' % self.level.levelId
def setRequestSave(self, data): def setRequestSave(self, data):
messenger.send(self.getSpecSaveEvent()) messenger.send(self.getSpecSaveEvent())
# clear out the attrib, it shouldn't be kept in the spec
self.level.levelSpec.doSetAttrib(self.entId, 'requestSave',
None)

6
direct/src/level/EditMgrBase.py
View File

@ -22,7 +22,13 @@ class EditMgrBase(Entity.Entity):
data['entType'], data['entType'],
data['parentEntId'], 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): def setRemoveEntity(self, data):
self.level.levelSpec.removeEntity(data['entId'], 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)