Changeset 3038 for code/trunk/src/orxonox/objects/worldentities

Timestamp:

May 24, 2009, 5:42:50 PM (16 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.

Location:

code/trunk/src/orxonox/objects/worldentities

Files:

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

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

@@ -91 +91 @@
 
             if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
-                this->getPlayer()->stopControl(this, false);
+                this->getPlayer()->stopControl();
 
             if (this->hud_)

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

@@ -39 +39 @@
     class _OrxonoxExport ControllableEntity : public MobileEntity
     {
+        friend class PlayerInfo; // PlayerInfo uses setPlayer and removePlayer
+
         public:
             ControllableEntity(BaseObject* creator);
@@ -50 +52 @@
             virtual void changedPlayer() {}
 
-            virtual void setPlayer(PlayerInfo* player);
-            virtual void removePlayer();
             inline PlayerInfo* getPlayer() const
                 { return this->player_; }
@@ -131 +131 @@
 
         protected:
+            virtual void setPlayer(PlayerInfo* player); // don't call this directly, use friend class PlayerInfo instead
+            virtual void removePlayer();                // don't call this directly, use friend class PlayerInfo instead
+
             virtual void startLocalHumanControl();
             virtual void stopLocalHumanControl();

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

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

@@ -47 +47 @@
             virtual void tick(float dt);
             void registerVariables();
-
-            virtual void setPlayer(PlayerInfo* player);
-            virtual void removePlayer();
 
             inline bool isAlive() const
@@ -113 +110 @@
 
         protected:
+            virtual void setPlayer(PlayerInfo* player);
+            virtual void removePlayer();
+
             virtual void death();
             virtual void deatheffect();

code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.h

@@ -46 +46 @@
             virtual void tick(float dt);
 
-            virtual void setPlayer(PlayerInfo* player);
-            virtual void startLocalHumanControl();
-
             virtual void moveFrontBack(const Vector2& value);
             virtual void moveRightLeft(const Vector2& value);
@@ -59 +56 @@
             virtual void fire(WeaponMode::Enum fireMode);
             virtual void greet();
+
+        protected:
+            virtual void setPlayer(PlayerInfo* player);
+            virtual void startLocalHumanControl();
 
         private: