Changeset 2819

Timestamp:

Mar 22, 2009, 9:59:34 PM (16 years ago)

Author:

landauf

Message:

moved gametype-HUD from PlayerInfo to HumanPlayer

Location:

code/branches/miniprojects/src/orxonox/objects/infos

Files:

• HumanPlayer.cc (modified) (7 diffs)
• HumanPlayer.h (modified) (4 diffs)
• PlayerInfo.cc (modified) (5 diffs)
• PlayerInfo.h (modified) (4 diffs)

code/branches/miniprojects/src/orxonox/objects/infos/HumanPlayer.cc

@@ -54 +54 @@
 
         this->humanHud_ = 0;
+        this->gametypeHud_ = 0;
 
         this->setConfigValues();
@@ -61 +62 @@
     HumanPlayer::~HumanPlayer()
     {
-        if (this->BaseObject::isInitialized() && this->humanHud_)
-            delete this->humanHud_;
+        if (this->BaseObject::isInitialized())
+        {
+            if (this->humanHud_)
+                delete this->humanHud_;
+
+            if (this->gametypeHud_)
+                delete this->gametypeHud_;
+        }
     }
 
@@ -115 +122 @@
 
             this->createController();
+            this->updateHumanHUD();
         }
     }
@@ -150 +158 @@
     }
 
+    void HumanPlayer::changedGametype()
+    {
+        PlayerInfo::changedGametype();
+
+        if (this->isInitialized() && this->isLocalPlayer())
+            if (this->getGametype()->getHUDTemplate() != "")
+                this->setGametypeHUDTemplate(this->getGametype()->getHUDTemplate());
+    }
+
     void HumanPlayer::changedControllableEntity()
     {
@@ -156 +173 @@
         if (this->humanHud_)
             this->humanHud_->setOwner(this->getControllableEntity());
+
+        if (this->gametypeHud_)
+            this->gametypeHud_->setOwner(this->getControllableEntity());
     }
 
@@ -166 +186 @@
         }
 
-        if (this->humanHudTemplate_ != "")
+        if (this->isLocalPlayer() && this->humanHudTemplate_ != "")
         {
             this->humanHud_ = new OverlayGroup(this);
@@ -173 +193 @@
         }
     }
+
+    void HumanPlayer::updateGametypeHUD()
+    {
+        if (this->gametypeHud_)
+        {
+            delete this->gametypeHud_;
+            this->gametypeHud_ = 0;
+        }
+
+        if (this->isLocalPlayer() && this->gametypeHudTemplate_ != "")
+        {
+            this->gametypeHud_ = new OverlayGroup(this);
+            this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
+            this->gametypeHud_->setOwner(this->getControllableEntity());
+        }
+    }
 }

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

@@ -51 +51 @@
             void setClientID(unsigned int clientID);
 
+            virtual void changedGametype();
             virtual void changedControllableEntity();
 
@@ -63 +64 @@
             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_; }
 
         protected:
@@ -76 +89 @@
 
             void updateHumanHUD();
+            void updateGametypeHUD();
 
             std::string nick_;
@@ -85 +99 @@
             std::string humanHudTemplate_;
             OverlayGroup* humanHud_;
+            std::string gametypeHudTemplate_;
+            OverlayGroup* gametypeHud_;
     };
 }

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

@@ -35 +35 @@
 #include "network/ClientInformation.h"
 #include "objects/gametypes/Gametype.h"
-#include "overlays/OverlayGroup.h"
 
 namespace orxonox
@@ -51 +50 @@
         this->controllableEntity_ = 0;
         this->controllableEntityID_ = CLIENTID_UNKNOWN;
-        this->gametypeHud_ = 0;
 
         this->registerVariables();
@@ -70 +68 @@
             if (this->getGametype())
                 this->getGametype()->playerLeft(this);
-
-            if (this->BaseObject::isInitialized() && this->gametypeHud_)
-                delete this->gametypeHud_;
         }
     }
@@ -109 +104 @@
                 else
                     this->getGametype()->playerEntered(this);
-
-                if (this->isLocalPlayer() && this->isHumanPlayer())
-                    if (this->getGametype()->getHUDTemplate() != "")
-                        this->setGametypeHUDTemplate(this->getGametype()->getHUDTemplate());
             }
         }
@@ -185 +176 @@
         }
     }
-
-    void PlayerInfo::changedControllableEntity()
-    {
-        if (this->gametypeHud_)
-            this->gametypeHud_->setOwner(this->getControllableEntity());
-    }
-
-    void PlayerInfo::updateGametypeHUD()
-    {
-        if (this->gametypeHud_)
-        {
-            delete this->gametypeHud_;
-            this->gametypeHud_ = 0;
-        }
-
-        if (this->isLocalPlayer() && this->isHumanPlayer() && this->gametypeHudTemplate_ != "")
-        {
-            this->gametypeHud_ = new OverlayGroup(this);
-            this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
-            this->gametypeHud_->setOwner(this->getControllableEntity());
-        }
-    }
 }

code/branches/miniprojects/src/orxonox/objects/infos/PlayerInfo.h

@@ -50 +50 @@
 
             virtual void changedController() {}
-            virtual void changedControllableEntity();
+            virtual void changedControllableEntity() {}
 
             inline bool isHumanPlayer() const
@@ -77 +77 @@
                 { return this->controller_; }
 
-            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_; }
-
         protected:
             void createController();
@@ -102 +88 @@
         private:
             void networkcallback_changedcontrollableentityID();
-            void updateGametypeHUD();
 
             bool bReadyToSpawn_;
@@ -108 +93 @@
             ControllableEntity* controllableEntity_;
             unsigned int controllableEntityID_;
-            std::string gametypeHudTemplate_;
-            OverlayGroup* gametypeHud_;
     };
 }