Changeset 7533 for code/trunk/src/orxonox/worldentities

Timestamp:

Oct 13, 2010, 11:35:18 AM (14 years ago)

Author:

dafrick

Message:

Documenting in pickups module.
Cleaning up in PickupManager.
Removed some obsolete functions in HumanController and ControllableEntity, which were remenants of the old pickups module.
Fixed a bug.

Location:

code/trunk/src/orxonox/worldentities

Files:

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

code/trunk/src/orxonox/worldentities/ControllableEntity.cc

@@ -281 +281 @@
 
         this->player_ = player;
+        this->formerPlayer_ = player;
         this->playerID_ = player->getObjectID();
         this->bHasLocalController_ = player->isLocalPlayer();

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

@@ -55 +55 @@
             inline PlayerInfo* getPlayer() const
                 { return this->player_; }
+            /**
+            @brief Get the player even after the ControllableEntity has stopped being the players ControllableEntity.
+            @return Returns the most recent PlayerInfo.
+            */
+            inline PlayerInfo* getFormerPlayer() const
+                { return this->formerPlayer_; }
 
             inline void setDestroyWhenPlayerLeft(bool bDestroy)
@@ -89 +95 @@
             virtual void boost() {}
             virtual void greet() {}
-            virtual void useItem() {}
-            virtual void dropItems() {}
             virtual void switchCamera();
             virtual void mouseLook();
@@ -204 +208 @@
 
             PlayerInfo* player_;
+            PlayerInfo* formerPlayer_;
             unsigned int playerID_;
 

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

@@ -248 +248 @@
             this->setDestroyWhenPlayerLeft(false);
 
-            this->dropItems();
-
             if (this->getGametype())
                 this->getGametype()->pawnKilled(this, this->lastHitOriginator_);