Changeset 2428 for code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc

Timestamp:

Dec 13, 2008, 10:54:26 PM (15 years ago)

Author:

landauf

Message:

• Moved some variables from Gametype to GametypeInfo (Gametype exists only on the Server while GametypeInfo is synchronized)
• Created a new HUD-element, GametypeStatus, based on GametypeInfo (the same effect was formerly achieved by using a hack in Spectator and a TextOverlay)
• HumanController creates a HUD (additionally to the SpaceShips HUD) which includes GametypeStatus and ChatOverlay and even more in the future

File:

• code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc

@@ -112 +112 @@
         if (this->controllableEntity_)
             this->controller_->setControllableEntity(this->controllableEntity_);
+        this->changedController();
     }
 
     void PlayerInfo::startControl(ControllableEntity* entity)
     {
+        if (entity == this->controllableEntity_)
+            return;
+
         if (this->controllableEntity_)
             this->stopControl(this->controllableEntity_);