Changeset 7903 for code/branches/lastmanstanding3/src

Timestamp:

Feb 16, 2011, 11:17:30 AM (14 years ago)

Author:

scheusso

Message:

Merge branch 'jo-test' into lms3

Location:

code/branches/lastmanstanding3/src

Files:

• modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• modules/overlays/hud/GametypeStatus.cc (modified) (5 diffs)
• modules/overlays/hud/GametypeStatus.h (modified) (1 diff)
• modules/overlays/hud/LastTeamStandingInfos.cc (added)
• modules/overlays/hud/LastTeamStandingInfos.h (copied) (copied from code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.h) (2 diffs)
• orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• orxonox/gametypes/CMakeLists.txt (modified) (1 diff)
• orxonox/gametypes/Gametype.h (modified) (1 diff)
• orxonox/gametypes/LastTeamStanding.cc (added)
• orxonox/gametypes/LastTeamStanding.h (added)

code/branches/lastmanstanding3/src/modules/overlays/hud/CMakeLists.txt

@@ -16 +16 @@
   GametypeFadingMessage.cc
   LastManStandingInfos.cc
+  LastTeamStandingInfos.cc
 )

code/branches/lastmanstanding3/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/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.h

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

code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Johannes Ritz
  *   Co-authors:
- *      ...
+ *      
  *
  */
 
-#ifndef _GametypeStatus_H__
-#define _GametypeStatus_H__
+#ifndef _LastTeamStandingInfos_H__
+#define _LastTeamStandingInfos_H__
 
 #include "overlays/OverlaysPrereqs.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OverlaysExport GametypeStatus : public OverlayText, public Tickable
+    class _OverlaysExport LastTeamStandingInfos : public OverlayText, public Tickable
     {
         public:
-            GametypeStatus(BaseObject* creator);
-            virtual ~GametypeStatus();
+            LastTeamStandingInfos(BaseObject* creator);
+            virtual ~LastTeamStandingInfos();
 
             virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void changedOwner();
 
-            void setDisplayCaption(bool bValue); //!< Toggles whether the gametype status is displayed.
+            inline void setShowLives(bool value)
+                { this->bShowLives_ = value; }
+            inline bool getShowLives() const
+                { return this->bShowLives_; }
+
+            inline void setShowTeams(bool value)
+                { this->bShowTeams_ = value; }
+            inline bool getShowTeams() const
+                { return this->bShowTeams_; }
 
         private:
-            PlayerInfo* owner_;
-            bool bNoCaption_;
-
+            LastTeamStanding* lts_;
+            PlayerInfo* player_;
+            bool bShowLives_;
+            bool bShowTeams_;
     };
 }
-#endif /* _GametypeStatus_H__ */
+#endif /* _LastTeamStandingInfos_H__ */

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

@@ -96 +96 @@
     class Gametype;
     class LastManStanding;
+    class LastTeamStanding;
     class TeamBaseMatch;
     class TeamDeathmatch;

code/branches/lastmanstanding3/src/orxonox/gametypes/CMakeLists.txt

@@ -8 +8 @@
   Dynamicmatch.cc
   LastManStanding.cc
+  LastTeamStanding.cc
 )

code/branches/lastmanstanding3/src/orxonox/gametypes/Gametype.h

@@ -150 +150 @@
               { this->timeLimit_ = t; }
 
+            //inline bool getForceSpawn()
+            //  { return this->bForceSpawn_; }       
+
             virtual void resetTimer();
             virtual void resetTimer(float t);