Changeset 3073 for code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

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/pawns/Pawn.cc (modified) (3 diffs)

code/trunk

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

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

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();
     }
 

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