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

keeping parentId if it is already set as a quick fix

Browse Source
This commit is contained in:
Dave Schuyler 2005-01-06 06:28:33 +00:00
parent 64055186bb
commit a14e7211bf
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,8 +8,6 @@ from PyDatagram import PyDatagram
from PyDatagramIterator import PyDatagramIterator from PyDatagramIterator import PyDatagramIterator
class DistributedObjectAI(DirectObject.DirectObject): class DistributedObjectAI(DirectObject.DirectObject):
"""Distributed Object class:"""
notify = directNotify.newCategory("DistributedObjectAI") notify = directNotify.newCategory("DistributedObjectAI")
QuietZone = 1 QuietZone = 1
@ -220,8 +218,9 @@ class DistributedObjectAI(DirectObject.DirectObject):
self.air.generateWithRequired(self, zoneId, optionalFields) self.air.generateWithRequired(self, zoneId, optionalFields)
if wantOtpServer: if wantOtpServer:
#HACK: #HACK:
parentId = simbase.air.districtId if not hasattr(self, 'parentId'):
self.parentId = parentId parentId = simbase.air.districtId
self.parentId = parentId
self.zoneId = zoneId self.zoneId = zoneId
self.generate() self.generate()
@ -238,8 +237,9 @@ class DistributedObjectAI(DirectObject.DirectObject):
self.air.generateWithRequiredAndId(self, doId, zoneId, optionalFields) self.air.generateWithRequiredAndId(self, doId, zoneId, optionalFields)
if wantOtpServer: if wantOtpServer:
#HACK: #HACK:
parentId = simbase.air.districtId if not hasattr(self, 'parentId'):
self.parentId = parentId parentId = simbase.air.districtId
self.parentId = parentId
self.zoneId = zoneId self.zoneId = zoneId
self.generate() self.generate()
@ -255,6 +255,7 @@ class DistributedObjectAI(DirectObject.DirectObject):
# The repository is the one that really does the work # The repository is the one that really does the work
self.air.sendGenerateOtpObject( self.air.sendGenerateOtpObject(
self, parentId, zoneId, optionalFields, doId=doId) self, parentId, zoneId, optionalFields, doId=doId)
assert not hasattr(self, 'parentId')
self.parentId = parentId self.parentId = parentId
self.zoneId = zoneId self.zoneId = zoneId
self.generate() self.generate()