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

Timestamp:

May 24, 2009, 5:42:50 PM (15 years ago)

Author:

landauf

Message:

Cleaned up setPlayer/removePlayer interface between PlayerInfo and ControllableEntity. The whole control is now up to the PlayerInfo, the respective functions in ControllableEntity are now protected.

File:

• code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (1 diff)

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

@@ -209 +209 @@
                 this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
 
-            if (this->getPlayer())
-                this->getPlayer()->stopControl(this);
+            if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
+                this->getPlayer()->stopControl();
 
             if (GameMode::isMaster())