removed air from AI entity constructor param list

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)
 

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)))

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"""

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,9 +34,8 @@ 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)