Changeset 3073 for code/trunk/src/orxonox/objects/worldentities

Timestamp:

May 25, 2009, 8:30:15 PM (16 years ago)

Author:

landauf

Message:

merged pickups2 branch back to trunk. not yet tested.

Location:

code/trunk

Files:

• . (modified) (2 props)
• src/orxonox/objects/worldentities/ControllableEntity.h (modified) (1 diff)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (3 diffs)
• src/orxonox/objects/worldentities/pawns/Pawn.h (modified) (3 diffs)

code/trunk

@@ -1 +1 @@
 build
 codeblocks
+dependencies

@@ -1 +1 @@
 build
 codeblocks
+dependencies

code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -85 +85 @@
             virtual void boost() {}
             virtual void greet() {}
-            virtual void use() {}
+            virtual void useItem() {}
             virtual void dropItems() {}
             virtual void switchCamera();

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -66 +66 @@
         this->spawnparticleduration_ = 3.0f;
 
-        this->getPickUp().setPlayer(this);
+        this->getPickups().setOwner(this);
 
         if (GameMode::isMaster())
@@ -214 +214 @@
             this->setDestroyWhenPlayerLeft(false);
 
+            this->dropItems();
+
             if (this->getGametype())
                 this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
@@ -278 +280 @@
     void Pawn::dropItems()
     {
-        pickUp.eraseAll();
+        this->getPickups().clear();
     }
 

code/trunk/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"
+#include "objects/pickup/PickupCollection.h"
 
 namespace orxonox
@@ -106 +106 @@
                 { return this->numexplosionchunks_; }
 
-            inline ShipEquipment& getPickUp()
-                {return this->pickUp;}
-
             virtual void dropItems();
+            inline PickupCollection& getPickups()
+                { return this->pickups_; }
+            virtual void useItem()
+                { this->pickups_.useItem(); }
 
         protected:
@@ -119 +120 @@
             virtual void spawneffect();
 
-            ShipEquipment pickUp;
             bool bAlive_;
 
+            PickupCollection pickups_;
 
             float health_;

@@ -1 +1 @@
 build
 codeblocks
+dependencies