Changeset 8178 for code/trunk/src/modules/overlays

Timestamp:

Apr 3, 2011, 7:56:47 PM (14 years ago)

Author:

jo

Message:

Merged lastmastanding3 into trunk. There's an xml parsing error that only appeared after merging. The level seems to load properly though.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/GametypeStatus.cc (modified) (5 diffs)
• src/modules/overlays/hud/GametypeStatus.h (modified) (1 diff)
• src/modules/overlays/hud/LastTeamStandingInfos.cc (copied) (copied from code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.cc)
• src/modules/overlays/hud/LastTeamStandingInfos.h (copied) (copied from code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.h)

code/trunk/src/modules/overlays/hud/CMakeLists.txt

@@ -17 +17 @@
   LastManStandingInfos.cc
   PauseNotice.cc
+  LastTeamStandingInfos.cc
 )

code/trunk/src/modules/overlays/hud/GametypeStatus.cc

@@ -36 +36 @@
 #include "worldentities/ControllableEntity.h"
 #include "worldentities/pawns/Spectator.h"
+//#include "gametypes/Gametype.h"
 
 namespace orxonox
@@ -50 +51 @@
         RegisterObject(GametypeStatus);
 
+        //this->game_ = 0;
         this->owner_ = 0;
         this->bNoCaption_ = false;
+        //this->bForcedSpawn_ = false;
 
         ModifyConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name).setObject(this);
@@ -67 +70 @@
         if (this->owner_ && this->owner_->getGametypeInfo() && this->owner_->getControllableEntity())
         {
+            //if (this->game_)
+            //    this->bForcedSpawn_ = this->game_->getForceSpawn();
+            //else
+            //    this->bForcedSpawn_ = false;
+
             const GametypeInfo* gtinfo = this->owner_->getGametypeInfo();
             ControllableEntity* ce = this->owner_->getControllableEntity();
@@ -87 +95 @@
                 if (gtinfo->isStartCountdownRunning())
                     this->setCaption(multi_cast<std::string>(static_cast<int>(ceil(gtinfo->getStartCountdown()))));
-                else if (ce->isA(Class(Spectator)))
+                else if (ce->isA(Class(Spectator))/*&&(!bForcedSpawn_)*/)
                     this->setCaption("Press [Fire] to respawn");
                 else
@@ -101 +109 @@
     {
         SUPER(GametypeStatus, changedOwner);
-
+        //this->game_ = orxonox_cast<Gametype*>(this->getOwner());
         this->owner_ = orxonox_cast<PlayerInfo*>(this->getOwner());
     }

code/trunk/src/modules/overlays/hud/GametypeStatus.h

@@ -49 +49 @@
 
         private:
+            //Gametype* game_;
             PlayerInfo* owner_;
             bool bNoCaption_;
+            //bool bForcedSpawn_;
 
     };