mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-05 03:15:07 -04:00
removed debugging
This commit is contained in:
parent
f9890a4f67
commit
35290754c9
@ -198,20 +198,11 @@ class DistributedObjectAI(DistributedObjectBase, EnforcesCalldowns):
|
|||||||
def d_setLocation(self, parentId, zoneId):
|
def d_setLocation(self, parentId, zoneId):
|
||||||
self.air.sendSetLocation(self, parentId, zoneId)
|
self.air.sendSetLocation(self, parentId, zoneId)
|
||||||
|
|
||||||
def checkFFparentId(self, parentId):
|
|
||||||
if parentId == 4294967295:
|
|
||||||
msg = 'DOAI.setLocation, parentId == 4294967295, doId = %s, class = %s, stack = %s' % (
|
|
||||||
self.doId, self.__class__.__name__, PythonUtil.StackTrace().compact())
|
|
||||||
print msg
|
|
||||||
self.air.writeServerEvent('parentIdFFFFFFFF', self.doId, msg)
|
|
||||||
|
|
||||||
def setLocation(self, parentId, zoneId):
|
def setLocation(self, parentId, zoneId):
|
||||||
# Prevent Duplicate SetLocations for being Called
|
# Prevent Duplicate SetLocations for being Called
|
||||||
if (self.parentId == parentId) and (self.zoneId == zoneId):
|
if (self.parentId == parentId) and (self.zoneId == zoneId):
|
||||||
return
|
return
|
||||||
|
|
||||||
self.checkFFparentId(parentId)
|
|
||||||
|
|
||||||
oldParentId = self.parentId
|
oldParentId = self.parentId
|
||||||
oldZoneId = self.zoneId
|
oldZoneId = self.zoneId
|
||||||
self.air.storeObjectLocation(self, parentId, zoneId)
|
self.air.storeObjectLocation(self, parentId, zoneId)
|
||||||
|
@ -199,8 +199,6 @@ class DoCollectionManager:
|
|||||||
"handleObjectLocation: doId: %s parentId: %s zoneId: %s"%
|
"handleObjectLocation: doId: %s parentId: %s zoneId: %s"%
|
||||||
(doId, parentId, zoneId))
|
(doId, parentId, zoneId))
|
||||||
# Let the object finish the job
|
# Let the object finish the job
|
||||||
if hasattr(obj, 'checkFFparentId'):
|
|
||||||
obj.checkFFparentId(parentId)
|
|
||||||
obj.setLocation(parentId, zoneId)
|
obj.setLocation(parentId, zoneId)
|
||||||
#self.storeObjectLocation(doId, parentId, zoneId)
|
#self.storeObjectLocation(doId, parentId, zoneId)
|
||||||
else:
|
else:
|
||||||
@ -215,8 +213,6 @@ class DoCollectionManager:
|
|||||||
zoneId = di.getUint32()
|
zoneId = di.getUint32()
|
||||||
distObj = self.doId2do.get(self.getMsgChannel())
|
distObj = self.doId2do.get(self.getMsgChannel())
|
||||||
if distObj is not None:
|
if distObj is not None:
|
||||||
if hasattr(distObj, 'checkFFparentId'):
|
|
||||||
distObj.checkFFparentId(parentId)
|
|
||||||
distObj.setLocation(parentId, zoneId)
|
distObj.setLocation(parentId, zoneId)
|
||||||
else:
|
else:
|
||||||
self.notify.warning('handleSetLocation: object %s not present' % self.getMsgChannel())
|
self.notify.warning('handleSetLocation: object %s not present' % self.getMsgChannel())
|
||||||
@ -245,8 +241,6 @@ class DoCollectionManager:
|
|||||||
#assert len(self._doHierarchy) == len(self.doId2do)
|
#assert len(self._doHierarchy) == len(self.doId2do)
|
||||||
|
|
||||||
# Set the new parent and zone on the object
|
# Set the new parent and zone on the object
|
||||||
if hasattr(object, 'checkFFparentId'):
|
|
||||||
object.checkFFparentId(parentId)
|
|
||||||
object.parentId = parentId
|
object.parentId = parentId
|
||||||
object.zoneId = zoneId
|
object.zoneId = zoneId
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user