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

Timestamp:

May 12, 2009, 9:24:58 PM (15 years ago)

Author:

landauf

Message:

changed type of gametype-HUD and default-HUD to PlayerInfo (instead of Gametype and ControllableEntity respectively). The owner of the Pawn-HUD remains Pawn.

File:

• code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h (modified) (4 diffs)

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

@@ -48 +48 @@
             void setConfigValues();
 
-            virtual void changedGametype();
             virtual void changedPlayer() {}
 
@@ -126 +125 @@
                 { return this->bHasHumanController_; }
 
-            inline const GametypeInfo* getGametypeInfo() const
-                { return this->gtinfo_; }
-
             inline bool isInMouseLook() const
                 { return this->bMouseLook_; }
@@ -157 +153 @@
 
             void networkcallback_changedplayerID();
-            void networkcallback_changedgtinfoID();
 
             // Bullet btMotionState related
@@ -190 +185 @@
             std::list<CameraPosition*> cameraPositions_;
             std::string cameraPositionTemplate_;
-
-            const GametypeInfo* gtinfo_;
-            unsigned int gtinfoID_;
     };
 }