Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.h

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/infos/HumanPlayer.h (modified) (3 diffs)

code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.h

@@ -51 +51 @@
             void setClientID(unsigned int clientID);
 
-            virtual void changedGametype();
-            virtual void changedControllableEntity();
-
-            inline void setHumanHUDTemplate(const std::string& name)
-            {
-                if (name != this->humanHudTemplate_)
-                {
-                    this->humanHudTemplate_ = name;
-                    this->updateHumanHUD();
-                }
-            }
-            inline const std::string& getHumanHUDTemplate() const
-                { return this->humanHudTemplate_; }
-            inline OverlayGroup* getHumanHUD() const
-                { return this->humanHud_; }
-
-            inline void setGametypeHUDTemplate(const std::string& name)
-            {
-                if (name != this->gametypeHudTemplate_)
-                {
-                    this->gametypeHudTemplate_ = name;
-                    this->updateGametypeHUD();
-                }
-            }
-            inline const std::string& getGametypeHUDTemplate() const
-                { return this->gametypeHudTemplate_; }
-            inline OverlayGroup* getGametypeHUD() const
-                { return this->gametypeHud_; }
+            virtual void changedController();
 
         protected:
@@ -88 +61 @@
             void networkcallback_client_initialized();
 
-            void updateHumanHUD();
-            void updateGametypeHUD();
-
             std::string nick_;
             std::string synchronize_nick_;
@@ -96 +66 @@
             bool server_initialized_;
             bool client_initialized_;
-
-            std::string humanHudTemplate_;
-            OverlayGroup* humanHud_;
-            std::string gametypeHudTemplate_;
-            OverlayGroup* gametypeHud_;
     };
 }