Changeset 2831 for code/branches/pickups/src/orxonox/objects/worldentities

Timestamp:

Mar 23, 2009, 2:39:47 PM (16 years ago)

Author:

danielh

Message:

removed old pickup system

Location:

code/branches/pickups/src/orxonox/objects/worldentities/pawns

Files:

• Pawn.cc (modified) (3 diffs)
• Pawn.h (modified) (3 diffs)

code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "util/Exception.h"
 #include "util/Math.h"
 #include "PawnManager.h"
@@ -61 +62 @@
         this->spawnparticleduration_ = 3.0f;
 
-        this->getPickUp().setPlayer(this);
-
         if (Core::isMaster())
         {
@@ -267 +266 @@
     void Pawn::dropItems()
     {
-        pickUp.eraseAll();
+        ThrowException(NotImplemented, "Pickupsystem not implemented yet.");
     }
 

code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "objects/pickup/ShipEquipment.h"
 #include "objects/worldentities/ControllableEntity.h"
 #include "objects/RadarViewable.h"
@@ -107 +106 @@
                 { return this->numexplosionchunks_; }
 
-            inline ShipEquipment& getPickUp()
-                {return this->pickUp;}
-
             virtual void dropItems();
 
@@ -117 +113 @@
             virtual void spawneffect();
 
-            ShipEquipment pickUp;
             bool bAlive_;