Changeset 7533 for code/trunk/src/orxonox

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

Files:

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

code/trunk/src/orxonox/controllers/HumanController.cc

@@ -56 +56 @@
     SetConsoleCommand("HumanController", "addBots",                &HumanController::addBots       ).addShortcut().defaultValues(1);
     SetConsoleCommand("HumanController", "killBots",               &HumanController::killBots      ).addShortcut().defaultValues(0);
-    SetConsoleCommand("HumanController", "dropItems",              &HumanController::dropItems     ).addShortcut();
-    SetConsoleCommand("HumanController", "useItem",                &HumanController::useItem       ).addShortcut();
     SetConsoleCommand("HumanController", "cycleNavigationFocus",   &HumanController::cycleNavigationFocus).addShortcut();
     SetConsoleCommand("HumanController", "releaseNavigationFocus", &HumanController::releaseNavigationFocus).addShortcut();
@@ -202 +200 @@
     }
 
-    void HumanController::useItem()
-    {
-        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-            HumanController::localController_s->controllableEntity_->useItem();
-    }
-
     void HumanController::addBots(unsigned int amount)
     {
@@ -218 +210 @@
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_ && HumanController::localController_s->controllableEntity_->getGametype())
             HumanController::localController_s->controllableEntity_->getGametype()->killBots(amount);
-    }
-
-    void HumanController::dropItems()
-    {
-        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-            HumanController::localController_s->controllableEntity_->dropItems();
     }
 

code/trunk/src/orxonox/controllers/HumanController.h

@@ -68 +68 @@
             static void switchCamera();
             static void mouseLook();
-            static void dropItems();
-            static void useItem();
             static void cycleNavigationFocus();
             static void releaseNavigationFocus();

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_);