Changeset 6782 for code/branches/ai/src

Timestamp:

Apr 26, 2010, 3:59:43 PM (14 years ago)

Author:

gasserlu

Message:

drone, dronecontroller implemented

Location:

code/branches/ai/src

Files:

• modules/pickup/PickupPrereqs.h (modified) (1 diff)
• modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• modules/pickup/items/DronePickup.cc (added)
• modules/pickup/items/DronePickup.h (added)
• orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• orxonox/interfaces/PickupCarrier.h (modified) (2 diffs)
• orxonox/worldentities/CMakeLists.txt (modified) (1 diff)

code/branches/ai/src/modules/pickup/PickupPrereqs.h

@@ -75 +75 @@
     
     //items
+    class DronePickup;
     class HealthPickup;
     class MetaPickup;

code/branches/ai/src/modules/pickup/items/CMakeLists.txt

@@ -2 +2 @@
   HealthPickup.cc
   MetaPickup.cc
+  DronePickup.cc
 )

code/branches/ai/src/orxonox/controllers/CMakeLists.txt

@@ -8 +8 @@
   WaypointController.cc
   WaypointPatrolController.cc
+  DroneController.cc
 )

code/branches/ai/src/orxonox/interfaces/PickupCarrier.h

@@ -52 +52 @@
     class HealthPickup;
     class MetaPickup;
+    class DronePickup;
 
     /**
@@ -67 +68 @@
         friend class HealthPickup;
         friend class MetaPickup;
+        friend class DronePickup;
         
         public:

code/branches/ai/src/orxonox/worldentities/CMakeLists.txt

@@ -5 +5 @@
   MobileEntity.cc
   ControllableEntity.cc
-
+  Drone.cc
   BigExplosion.cc
   EffectContainer.cc