Changeset 7636

Timestamp:

Nov 11, 2010, 1:35:49 AM (14 years ago)

Author:

landauf

Message:

compiles and works

Location:

code/branches/lastmanstanding

Files:

• data/overlays/lastmanstandinghud.oxo (modified) (2 diffs)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/overlays/hud/LastManStandingInfos.cc (modified) (2 diffs)
• src/modules/overlays/hud/LastManStandingInfos.h (modified) (2 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/gametypes/LastManStanding.cc (modified) (2 diffs)
• src/orxonox/gametypes/LastManStanding.h (modified) (1 diff)

code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo

@@ -20 +20 @@
      align    = "center"
     />
-    <!--LastManStandingInfos
+    <LastManStandingInfos
      position  = "0.63, 0.05"
      pickpoint = "0.0, 0.0"
@@ -30 +30 @@
      showlives     = true
      showplayers     = false
-    /-->
+    />
 
     <OverlayText

code/branches/lastmanstanding/src/modules/overlays/OverlaysPrereqs.h

@@ -88 +88 @@
     class HUDTimer;
     class KillMessage;
+    class LastManStandingInfos;
     class TeamBaseMatchScore;
     class UnderAttackHealthBar;

code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.cc

@@ -43 +43 @@
         RegisterObject(LastManStandingInfos);
 
-        this->owner_ = 0;
+        this->lms_ = 0;
+        this->player_ = 0;
         this->bShowLives_ = false;
         this->bShowPlayers_ = false;
@@ -64 +65 @@
         SUPER(LastManStandingInfos, tick, dt);
 
-        if (this->owner_)
+        if (this->player_ && this->lms_)
         {
-
-            Pawn* pawn = dynamic_cast<Pawn*>(this->getOwner()->getControllableEntity());
-            /*LastManStanding* */ owner_ = dynamic_cast<LastManStanding*>(this->getOwner()->getGametype());
-            int iLives = this->owner_->pawnGetLives(pawn);
-            const std::string& lives = multi_cast<std::string>(iLives);
-
-            const std::string& players = multi_cast<std::string>(this->owner_->playersAlive);
-
             if (this->bShowLives_)
             {
+                const std::string& lives = multi_cast<std::string>(this->lms_->playerGetLives(this->player_));
                 this->setCaption(lives);
             }
             else if(this->bShowPlayers_)
             {
+                const std::string& players = multi_cast<std::string>(this->lms_->getNumPlayersAlive());
                 this->setCaption(players);
             }
         }
     }
+
+    void LastManStandingInfos::changedOwner()
+    {
+        SUPER(LastManStandingInfos, changedOwner);
+
+        if (this->getOwner() && this->getOwner()->getGametype())
+        {
+            this->player_ = orxonox_cast<PlayerInfo*>(this->getOwner());
+            this->lms_ = orxonox_cast<LastManStanding*>(this->getOwner()->getGametype().get());
+        }
+        else
+        {
+            this->player_ = 0;
+            this->lms_ = 0;
+        }
+    }
 }

code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.h

@@ -45 +45 @@
             virtual void tick(float dt);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void changedOwner();
 
             inline void setShowLives(bool value)
@@ -57 +58 @@
 
         private:
-            LastManStanding* owner_;
+            LastManStanding* lms_;
+            PlayerInfo* player_;
             bool bShowLives_;
             bool bShowPlayers_;

code/branches/lastmanstanding/src/orxonox/OrxonoxPrereqs.h

@@ -93 +93 @@
     class Dynamicmatch;
     class Gametype;
+    class LastManStanding;
     class TeamBaseMatch;
     class TeamDeathmatch;

code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc

@@ -147 +147 @@
     }
 
-    int LastManStanding::pawnGetLives(Pawn* pawn)
-    {
-        if(!pawn)
-            return -1;
-        PlayerInfo* player= dynamic_cast<PlayerInfo*>(pawn);
-        if(!player)
-            return -2;
-        return playerLives_[player];
-    }
-
-    const int LastManStanding::playerGetLives(PlayerInfo* player)
+    int LastManStanding::playerGetLives(PlayerInfo* player)
     {
         if (player)
@@ -163 +153 @@
         else
             return 0;
+    }
+    
+    int LastManStanding::getNumPlayersAlive() const
+    {
+        return this->playersAlive;
     }
 

code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h

@@ -73 +73 @@
 
             virtual void end(); //!< Sends an end message.
-            virtual int pawnGetLives(Pawn* pawn); //!< Returns amount of Lives of a certain player.
-            const int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
+            int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
+            int getNumPlayersAlive() const; //!< Returns the number of players that are still alive.
             virtual void playerEntered(PlayerInfo* player); //!< Initializes values. Manages the gametype's HUD. #Players alive via StaticMessage.
             virtual bool playerLeft(PlayerInfo* player); //!< Manages the gametype's HUD. #Players alive via StaticMessage.