Changeset 3038 for code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h

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/ControllableEntity.h (modified) (3 diffs)

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