TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 11:28:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

parentId added to generateWithRequiredAndId.

Browse Source
This commit is contained in:
Mike Goslin 2005-05-20 21:26:37 +00:00
parent c27ec35667
commit 95f37c45c1
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,6 +302,21 @@ class DistributedObjectAI(DirectObject.DirectObject):
# this is a special generate used for estates, or anything else that # this is a special generate used for estates, or anything else that
# needs to have a hard coded doId as assigned by the server # needs to have a hard coded doId as assigned by the server
if wantOtpServer:
def generateWithRequiredAndId(self, doId, parentId, zoneId, optionalFields=[]):
assert self.notify.debugStateCall(self)
# have we already allocated a doId?
if self.__preallocDoId:
assert doId == self.__preallocDoId
self.__preallocDoId = 0
# The repository is the one that really does the work
self.air.generateWithRequiredAndId(self, doId, parentId, zoneId, optionalFields)
self.parentId = parentId
self.zoneId = zoneId
self.__location = (parentId, zoneId)
self.generate()
else:
def generateWithRequiredAndId(self, doId, zoneId, optionalFields=[]): def generateWithRequiredAndId(self, doId, zoneId, optionalFields=[]):
assert self.notify.debugStateCall(self) assert self.notify.debugStateCall(self)
# have we already allocated a doId? # have we already allocated a doId?
@ -311,11 +326,6 @@ 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.generateWithRequiredAndId(self, doId, zoneId, optionalFields) self.air.generateWithRequiredAndId(self, doId, zoneId, optionalFields)
if wantOtpServer:
#HACK:
if not hasattr(self, 'parentId'):
parentId = self.air.districtId
self.parentId = parentId
self.zoneId = zoneId self.zoneId = zoneId
self.generate() self.generate()