Changeset 6405 for code/branches/pickup2/src/orxonox/worldentities/pawns/Pawn.h

Timestamp:

Dec 23, 2009, 8:27:17 PM (14 years ago)

Author:

dafrick

Message:

Commit changes in pickup before merge.

File:

• code/branches/pickup2/src/orxonox/worldentities/pawns/Pawn.h (modified) (3 diffs)

code/branches/pickup2/src/orxonox/worldentities/pawns/Pawn.h

@@ -35 +35 @@
 #include "interfaces/RadarViewable.h"
 #include "worldentities/ControllableEntity.h"
-#include "pickup/PickupCollection.h"
+//TODO: Remove.
+//#include "pickup/PickupCollection.h"
 
 namespace orxonox
@@ -109 +110 @@
                 { return this->numexplosionchunks_; }
 
-            virtual void dropItems();
-            inline PickupCollection& getPickups()
-                { return this->pickups_; }
-            virtual void useItem()
-                { this->pickups_.useItem(); }
+//TODO: Remove.
+//             virtual void dropItems();
+//             inline PickupCollection& getPickups()
+//                 { return this->pickups_; }
+//             virtual void useItem()
+//                 { this->pickups_.useItem(); }
 
             virtual void startLocalHumanControl();
@@ -128 +130 @@
             bool bAlive_;
 
-            PickupCollection pickups_;
+            //TODO: Remove.
+            //PickupCollection pickups_;
 
             float health_;