Changeset 6847

Timestamp:

May 3, 2010, 4:51:35 PM (15 years ago)

Author:

gasserlu

Message:

drone follows Owner

Location:

code/branches/ai/src

Files:

• modules/pickup/items/DronePickup.cc (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (2 diffs)
• orxonox/controllers/DroneController.cc (added)
• orxonox/controllers/DroneController.h (added)
• orxonox/worldentities/Drone.cc (modified) (1 diff)

code/branches/ai/src/modules/pickup/items/DronePickup.cc

@@ -141 +141 @@
                 if(droneController != NULL)
                 {
-                    droneController->setPawn(pawn);
+                    droneController->setOwner(pawn);
                 }
 

code/branches/ai/src/orxonox/OrxonoxPrereqs.h

@@ -82 +82 @@
     class ArtificialController;
     class Controller;
+    class DroneController;
     class HumanController;
     class ScriptController;
@@ -161 +162 @@
     class CameraPosition;
     class ControllableEntity;
+    class Drone;
     class EffectContainer;
     class ExplosionChunk;

code/branches/ai/src/orxonox/worldentities/Drone.cc

@@ -64 +64 @@
         
         myController_ = new DroneController(static_cast<BaseObject*>(this)); //!< Creates a new controller and passes our this pointer to it as creator.
+        myController_->setDrone(this);
+
         this->setController(myController_);
     }