Changeset 2324 for code/branches/pickups2/src/orxonox/objects/worldentities

Timestamp:

Dec 3, 2008, 4:07:49 PM (16 years ago)

Author:

dsommer

Message:

Aufnehmen von festen Item und wieder ablegen

Location:

code/branches/pickups2/src/orxonox/objects/worldentities

Files:

• ControllableEntity.h (modified) (1 diff)
• pawns/Pawn.cc (modified) (2 diffs)
• pawns/Pawn.h (modified) (1 diff)

code/branches/pickups2/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -70 +70 @@
             virtual void greet() {}
             virtual void use() {}
+            virtual void dropItems() {}
             virtual void switchCamera();
 

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

@@ -46 +46 @@
 
         this->bAlive_ = false;
-
+        this->getPickUp().setPlayer(this);
         this->health_ = 0;
         this->maxHealth_ = 0;
@@ -148 +148 @@
         this->spawn();
     }
+
+    void Pawn::dropItems()
+    {
+        pickUp.eraseAll();
+    }
 }

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

@@ -75 +75 @@
 
             virtual void fire();
+            virtual void postSpawn();
+
             inline ShipEquipment& getPickUp()
                 {return this->pickUp;}
-            virtual void postSpawn();
+
+            virtual void dropItems();
 
         protected: