From 538f856f6f036f3d7d711ba3cb9d3ac7396218e4 Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Thu, 25 Sep 2003 01:12:31 +0000 Subject: [PATCH] fixed distributed entity create-announce bug --- direct/src/level/DistributedEntity.py | 2 ++ direct/src/level/DistributedLevel.py | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/direct/src/level/DistributedEntity.py b/direct/src/level/DistributedEntity.py index aa033115f9..a612e39092 100755 --- a/direct/src/level/DistributedEntity.py +++ b/direct/src/level/DistributedEntity.py @@ -33,6 +33,8 @@ class DistributedEntity(DistributedObject.DistributedObject, Entity.Entity): # ask our level obj for our spec data level = toonbase.tcr.doId2do[self.levelDoId] self.initializeEntity(level, self.entId) + # announce our presence (Level does this for non-distributed entities) + self.level.onEntityCreate(self.entId) DistributedObject.DistributedObject.announceGenerate(self) diff --git a/direct/src/level/DistributedLevel.py b/direct/src/level/DistributedLevel.py index 5b2b30991e..678b09c24e 100755 --- a/direct/src/level/DistributedLevel.py +++ b/direct/src/level/DistributedLevel.py @@ -192,14 +192,16 @@ class DistributedLevel(DistributedObject.DistributedObject, def requestReparent(self, entity, parentId): assert(entity.entId != parentId) - if self.entities.has_key(parentId): + parent = self.getEntity(parentId) + if parent is not None: # parent has already been created - entity.reparentTo(self.entities[parentId].getNodePath()) + entity.reparentTo(parent.getNodePath()) else: # parent hasn't been created yet; schedule the reparent self.notify.debug( 'entity %s requesting reparent to %s, not yet created' % (entity, parentId)) + print self.entities entId = entity.entId entity.reparentTo(hidden)