Changeset 2973 for code/trunk/src/orxonox/objects/infos

Timestamp:

May 12, 2009, 9:24:58 PM (16 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.

Location:

code/trunk/src/orxonox/objects/infos

Files:

• HumanPlayer.cc (modified) (3 diffs)
• HumanPlayer.h (modified) (1 diff)
• PlayerInfo.cc (modified) (5 diffs)
• PlayerInfo.h (modified) (3 diffs)

code/trunk/src/orxonox/objects/infos/HumanPlayer.cc

@@ -167 +167 @@
     }
 
-    void HumanPlayer::changedControllableEntity()
-    {
-        PlayerInfo::changedControllableEntity();
-
-        if (this->humanHud_)
-            this->humanHud_->setOwner(this->getControllableEntity());
-    }
-
     void HumanPlayer::updateHumanHUD()
     {
@@ -187 +179 @@
             this->humanHud_ = new OverlayGroup(this);
             this->humanHud_->addTemplate(this->humanHudTemplate_);
-            this->humanHud_->setOwner(this->getControllableEntity());
+            this->humanHud_->setOwner(this);
         }
     }
@@ -203 +195 @@
             this->gametypeHud_ = new OverlayGroup(this);
             this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
-            this->gametypeHud_->setOwner(this->getGametype());
+            this->gametypeHud_->setOwner(this);
         }
     }

code/trunk/src/orxonox/objects/infos/HumanPlayer.h

@@ -52 +52 @@
 
             virtual void changedGametype();
-            virtual void changedControllableEntity();
 
             inline void setHumanHUDTemplate(const std::string& name)

code/trunk/src/orxonox/objects/infos/PlayerInfo.cc

@@ -51 +51 @@
         this->controllableEntityID_ = CLIENTID_UNKNOWN;
 
+        this->gtinfo_ = 0;
+        this->gtinfoID_ = OBJECTID_UNKNOWN;
+        this->updateGametypeInfo();
+
         this->registerVariables();
     }
@@ -76 +80 @@
         registerVariable(this->controllableEntityID_, variableDirection::toclient, new NetworkCallback<PlayerInfo>(this, &PlayerInfo::networkcallback_changedcontrollableentityID));
         registerVariable(this->bReadyToSpawn_,        variableDirection::toserver);
+        registerVariable(this->gtinfoID_,             variableDirection::toclient, new NetworkCallback<PlayerInfo>(this, &PlayerInfo::networkcallback_changedgtinfoID));
     }
 
@@ -88 +93 @@
     void PlayerInfo::changedGametype()
     {
+        this->updateGametypeInfo();
+
         if (this->isInitialized())
         {
@@ -108 +115 @@
     }
 
+    void PlayerInfo::updateGametypeInfo()
+    {
+        this->gtinfo_ = 0;
+        this->gtinfoID_ = OBJECTID_UNKNOWN;
+
+        if (this->getGametype() && this->getGametype()->getGametypeInfo())
+        {
+            this->gtinfo_ = this->getGametype()->getGametypeInfo();
+            this->gtinfoID_ = this->gtinfo_->getObjectID();
+        }
+    }
+
     void PlayerInfo::createController()
     {
@@ -181 +200 @@
         }
     }
+
+    void PlayerInfo::networkcallback_changedgtinfoID()
+    {
+        if (this->gtinfoID_ != OBJECTID_UNKNOWN)
+        {
+            this->gtinfo_ = dynamic_cast<GametypeInfo*>(Synchronisable::getSynchronisable(this->gtinfoID_));
+
+            if (!this->gtinfo_)
+                this->gtinfoID_ = OBJECTID_UNKNOWN;
+        }
+    }
 }

code/trunk/src/orxonox/objects/infos/PlayerInfo.h

@@ -77 +77 @@
                 { return this->controller_; }
 
+            inline const GametypeInfo* getGametypeInfo() const
+                { return this->gtinfo_; }
+
         protected:
             void createController();
@@ -88 +91 @@
         private:
             void networkcallback_changedcontrollableentityID();
+            void networkcallback_changedgtinfoID();
+            void updateGametypeInfo();
 
             bool bReadyToSpawn_;
@@ -93 +98 @@
             ControllableEntity* controllableEntity_;
             unsigned int controllableEntityID_;
+
+            const GametypeInfo* gtinfo_;
+            unsigned int gtinfoID_;
     };
 }