From 84a5f4a3447d74842ba3dba5fda7e41b6d3cb8c6 Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Wed, 30 Nov 2005 05:02:29 +0000 Subject: [PATCH] removed function that I just added --- direct/src/distributed/DoCollectionManager.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/direct/src/distributed/DoCollectionManager.py b/direct/src/distributed/DoCollectionManager.py index d4f2191cab..9dfe84c27b 100755 --- a/direct/src/distributed/DoCollectionManager.py +++ b/direct/src/distributed/DoCollectionManager.py @@ -191,7 +191,7 @@ class DoCollectionManager: oldZoneId = obj.zoneId if oldParentId != parentId: # Remove old location - self.deleteDoIdFromLocation(doId, oldParentId, oldZoneId) + self.deleteObjectLocation(doId, oldParentId, oldZoneId) if oldParentId == parentId and oldZoneId == zoneId: # object is already at that parent and zone return @@ -203,11 +203,7 @@ class DoCollectionManager: zoneDoSet = parentZoneDict.setdefault(zoneId, set()) zoneDoSet.add(doId) - def deleteObjectLocation(self, distObj): - self.deleteDoIdFromLocation( - distObj.doId, distObj.parentId, distObj.zoneId) - - def deleteDoIdFromLocation(self, doId, parentId, zoneId): + def deleteObjectLocation(self, doId, parentId, zoneId): # Do not worry about null values if (parentId is None) or (zoneId is None): return @@ -266,7 +262,7 @@ class DoCollectionManager: assert self.notify.debugStateCall(self) #assert not hasattr(do, "isQueryAllResponse") or not do.isQueryAllResponse #assert do.doId in self.doId2do - self.deleteObjectLocation(do) + self.deleteObjectLocation(do.doId, do.parentId, do.zoneId) ## location = do.getLocation() ## if location is not None: ## if location not in self.zoneId2doIds: