From 21135f8573106ec435b64a6b0d10ee83b087443f Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Mon, 29 Sep 2003 21:19:37 +0000 Subject: [PATCH] removed air from AI entity constructor param list --- direct/src/level/DistributedEntityAI.py | 4 ++-- .../src/level/DistributedInteractiveEntityAI.py | 5 ++--- direct/src/level/DistributedLevelAI.py | 2 +- direct/src/level/EntityCreatorAI.py | 15 +++++++-------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/direct/src/level/DistributedEntityAI.py b/direct/src/level/DistributedEntityAI.py index d7f4e9d0d6..5bea98e992 100755 --- a/direct/src/level/DistributedEntityAI.py +++ b/direct/src/level/DistributedEntityAI.py @@ -7,8 +7,8 @@ class DistributedEntityAI(DistributedObjectAI.DistributedObjectAI, notify = DirectNotifyGlobal.directNotify.newCategory( 'DistributedEntityAI') - def __init__(self, air, level, entId): - DistributedObjectAI.DistributedObjectAI.__init__(self, air) + def __init__(self, level, entId): + DistributedObjectAI.DistributedObjectAI.__init__(self, level.air) self.levelDoId = level.doId Entity.Entity.__init__(self, level, entId) diff --git a/direct/src/level/DistributedInteractiveEntityAI.py b/direct/src/level/DistributedInteractiveEntityAI.py index e19bbe8ec0..6a0f6dbcc3 100644 --- a/direct/src/level/DistributedInteractiveEntityAI.py +++ b/direct/src/level/DistributedInteractiveEntityAI.py @@ -24,10 +24,9 @@ class DistributedInteractiveEntityAI(DistributedEntityAI.DistributedEntityAI): if __debug__: notify = DirectNotifyGlobal.directNotify.newCategory('DistributedInteractiveEntityAI') - def __init__(self, air, level, entId): + def __init__(self, level, entId): """entId: a unique identifier for this prop.""" - DistributedEntityAI.DistributedEntityAI.__init__(self, air, - level, entId) + DistributedEntityAI.DistributedEntityAI.__init__(self, level, entId) assert(self.debugPrint( "DistributedInteractiveEntityAI(entId=%s)" %(entId))) diff --git a/direct/src/level/DistributedLevelAI.py b/direct/src/level/DistributedLevelAI.py index eb340eda96..98ae2a2637 100755 --- a/direct/src/level/DistributedLevelAI.py +++ b/direct/src/level/DistributedLevelAI.py @@ -51,7 +51,7 @@ class DistributedLevelAI(DistributedObjectAI.DistributedObjectAI, def createEntityCreator(self): """Create the object that will be used to create Entities. Inheritors, override if desired.""" - return EntityCreatorAI.EntityCreatorAI(self.air, level=self) + return EntityCreatorAI.EntityCreatorAI(level=self) def getEntityZoneId(self, entId): """figure out what network zoneId an entity is in""" diff --git a/direct/src/level/EntityCreatorAI.py b/direct/src/level/EntityCreatorAI.py index 923e304373..051b7bca68 100755 --- a/direct/src/level/EntityCreatorAI.py +++ b/direct/src/level/EntityCreatorAI.py @@ -8,20 +8,20 @@ from PythonUtil import Functor # some useful constructor functions # ctor functions for entities must take -# (air, level, entId, zoneId) +# (level, entId, zoneId) # this func creates distributed entities whose constructors take # (air, level doId, entId) # and do not generate themselves -def createDistributedEntity(AIclass, air, level, entId, zoneId): +def createDistributedEntity(AIclass, level, entId, zoneId): """create a distributed entity and call generate""" - ent = AIclass(air, level, entId) + ent = AIclass(level, entId) ent.generateWithRequired(zoneId) return ent # this func creates local entities whose constructors take # (level, entId) -def createLocalEntity(AIclass, air, level, entId, zoneId): +def createLocalEntity(AIclass, level, entId, zoneId): """create a local entity""" ent = AIclass(level, entId) @@ -34,10 +34,9 @@ class EntityCreatorAI(EntityCreatorBase.EntityCreatorBase): """This class is responsible for creating instances of Entities on the AI. It can be subclassed to handle more Entity types.""" - def __init__(self, air, level): + def __init__(self, level): EntityCreatorBase.EntityCreatorBase.__init__(self, level) - self.air = air - + # create short aliases for ctor funcs cLE = createLocalEntity @@ -51,4 +50,4 @@ class EntityCreatorAI(EntityCreatorBase.EntityCreatorBase): def doCreateEntity(self, ctor, entId): zoneId = self.level.getEntityZoneId(entId) self.notify.debug('creating entity %s in zone %s' % (entId, zoneId)) - return ctor(self.air, self.level, entId, zoneId) + return ctor(self.level, entId, zoneId)