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

Timestamp:

Apr 8, 2009, 12:58:47 AM (15 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.cc (modified) (8 diffs)

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

@@ -30 +30 @@
 #include "HumanPlayer.h"
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -47 +47 @@
         RegisterObject(HumanPlayer);
 
-        this->server_initialized_ = GameMode::isMaster();
+        this->server_initialized_ = Core::isMaster();
         this->client_initialized_ = false;
 
         this->bHumanPlayer_ = true;
         this->defaultController_ = Class(HumanController);
-
-        this->humanHud_ = 0;
-        this->gametypeHud_ = 0;
 
         this->setConfigValues();
@@ -62 +59 @@
     HumanPlayer::~HumanPlayer()
     {
-        if (this->BaseObject::isInitialized())
-        {
-            if (this->humanHud_)
-                delete this->humanHud_;
-
-            if (this->gametypeHud_)
-                delete this->gametypeHud_;
-        }
     }
 
@@ -93 +82 @@
             this->synchronize_nick_ = this->nick_;
 
-            if (GameMode::isMaster())
+            if (Core::isMaster())
                 this->setName(this->nick_);
         }
@@ -100 +89 @@
     void HumanPlayer::configvaluecallback_changedHUDTemplate()
     {
-        this->setHumanHUDTemplate(this->hudtemplate_);
+        this->changedController();
     }
 
@@ -116 +105 @@
             this->client_initialized_ = true;
 
-            if (!GameMode::isMaster())
+            if (!Core::isMaster())
                 this->setObjectMode(objectDirection::bidirectional);
             else
@@ -122 +111 @@
 
             this->createController();
-            this->updateHumanHUD();
         }
     }
@@ -158 +146 @@
     }
 
-    void HumanPlayer::changedGametype()
+    void HumanPlayer::changedController()
     {
-        PlayerInfo::changedGametype();
+        if (this->getController())
+        {
+            this->getController()->setHUDTemplate(this->hudtemplate_);
 
-        if (this->isInitialized() && this->isLocalPlayer())
-            if (this->getGametype()->getHUDTemplate() != "")
-                this->setGametypeHUDTemplate(this->getGametype()->getHUDTemplate());
-    }
-
-    void HumanPlayer::changedControllableEntity()
-    {
-        PlayerInfo::changedControllableEntity();
-
-        if (this->humanHud_)
-            this->humanHud_->setOwner(this->getControllableEntity());
-    }
-
-    void HumanPlayer::updateHumanHUD()
-    {
-        if (this->humanHud_)
-        {
-            delete this->humanHud_;
-            this->humanHud_ = 0;
-        }
-
-        if (this->isLocalPlayer() && this->humanHudTemplate_ != "")
-        {
-            this->humanHud_ = new OverlayGroup(this);
-            this->humanHud_->addTemplate(this->humanHudTemplate_);
-            this->humanHud_->setOwner(this->getControllableEntity());
-        }
-    }
-
-    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->getGametype());
+            if (this->getController() && this->getController()->getHUD())
+                this->getController()->getHUD()->setOwner(this->getControllableEntity());
         }
     }