From e9c5b8c8bcdad22927815c4c1621f246efd27d55 Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Wed, 20 Jul 2005 01:23:51 +0000 Subject: [PATCH] changed get location --- direct/src/distributed/DistributedObject.py | 7 ++++++- direct/src/distributed/DistributedObjectAI.py | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/direct/src/distributed/DistributedObject.py b/direct/src/distributed/DistributedObject.py index 8239a893bc..6c5333488f 100644 --- a/direct/src/distributed/DistributedObject.py +++ b/direct/src/distributed/DistributedObject.py @@ -410,7 +410,12 @@ class DistributedObject(PandaObject): parentObj.handleChildArrive(self, zoneId) def getLocation(self): - return (self.parentId, self.zoneId) + try: + if self.parentId <= 0 and self.zoneId <= 0: + return None + return (self.parentId, self.zoneId) + except AttributeError: + return None def handleChildArrive(self, childObj, zoneId): self.notify.debugCall() diff --git a/direct/src/distributed/DistributedObjectAI.py b/direct/src/distributed/DistributedObjectAI.py index 58cc955530..59e5db4ea0 100644 --- a/direct/src/distributed/DistributedObjectAI.py +++ b/direct/src/distributed/DistributedObjectAI.py @@ -204,7 +204,12 @@ class DistributedObjectAI(DirectObject): self.zoneId=zoneId def getLocation(self): - return (self.parentId, self.zoneId) + try: + if self.parentId <= 0 and self.zoneId <= 0: + return None + return (self.parentId, self.zoneId) + except AttributeError: + return None else: # NON OTP