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

fixed for Skyler

Browse Source
This commit is contained in:
Joe Shochet 2005-07-20 02:08:57 +00:00
parent e9c5b8c8bc
commit 0037bf99c2
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
direct/src/distributed/DistributedObject.py
View File

@ -413,6 +413,9 @@ class DistributedObject(PandaObject):
try:
if self.parentId <= 0 and self.zoneId <= 0:
return None
# This is a -1 stuffed into a uint32
if self.parentId == 0xffffffff and self.zoneId == 0xffffffff:
return None
return (self.parentId, self.zoneId)
except AttributeError:
return None

7
direct/src/distributed/DistributedObjectAI.py
View File

@ -53,7 +53,7 @@ class DistributedObjectAI(DirectObject):
if __debug__:
def status(self, indent=0):
"""
print out "doId(parentId,zoneId) className
print out doId(parentId,zoneId) className
and conditionally show generated, disabled, neverDisable,
or cachable
"""
@ -134,7 +134,7 @@ class DistributedObjectAI(DirectObject):
def isDeleted(self):
"""
Returns true if the object has been deleted,
or if it is brand new and hasn't yet been generated.
or if it is brand new and hasnt yet been generated.
"""
return self.air == None
@ -207,6 +207,9 @@ class DistributedObjectAI(DirectObject):
try:
if self.parentId <= 0 and self.zoneId <= 0:
return None
# This is a -1 stuffed into a uint32
if self.parentId == 0xffffffff and self.zoneId == 0xffffffff:
return None
return (self.parentId, self.zoneId)
except AttributeError:
return None

6
direct/src/distributed/DoCollectionManager.py
View File

@ -119,7 +119,7 @@ class DoCollectionManager:
# the zoneId2doIds table should be empty now
if len(self.zoneId2doIds) > 0:
AIRepository.notify.warning(
self.notify.warning(
'zoneId2doIds table not empty: %s' % self.zoneId2doIds)
self.zoneId2doIds = {}
@ -231,7 +231,7 @@ class DoCollectionManager:
location = do.getLocation()
if location is not None:
if location not in self.zoneId2doIds:
AIRepository.notify.warning(
self.notify.warning(
'dobj %s (%s) has invalid location: %s' %
(do, do.doId, location))
else:
@ -247,7 +247,7 @@ class DoCollectionManager:
assert do.doId in self.doId2do
if do.zoneId is not None:
if do.zoneId not in self.zoneId2doIds:
AIRepository.notify.warning(
self.notify.warning(
'dobj %s (%s) has invalid zoneId: %s' %
(do, do.doId, do.zoneId))
else: