Changeset 2495 for code/branches/presentation/src/orxonox/objects/gametypes/Gametype.h

Timestamp:

Dec 17, 2008, 4:05:25 AM (15 years ago)

Author:

rgrieder

Message:

Added stats overlay. "OverlayGroup toggleVisibility Stats" will do what it says.

File:

• code/branches/presentation/src/orxonox/objects/gametypes/Gametype.h (modified) (5 diffs)

code/branches/presentation/src/orxonox/objects/gametypes/Gametype.h

@@ -53 +53 @@
     }
 
+    struct Player
+    {
+        PlayerInfo* info_;
+        PlayerState::Enum state_;
+        int frags_;
+        int killed_;
+    };
+
     class _OrxonoxExport Gametype : public BaseObject, public Tickable
     {
         friend class PlayerInfo;
-        friend class ClassIdentifier<Gametype>;
 
         public:
@@ -82 +89 @@
             virtual void playerChangedName(PlayerInfo* player);
 
-            virtual void playerScored(PlayerInfo* player);
+            virtual void playerScored(Player& player);
 
             virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
@@ -88 +95 @@
             virtual void pawnPostSpawn(Pawn* pawn);
 
-            inline const std::map<PlayerInfo*, PlayerState::Enum>& getPlayers() const
+            inline const std::map<PlayerInfo*, Player>& getPlayers() const
                 { return this->players_; }
 
@@ -104 +111 @@
             inline unsigned int getNumberOfPlayers() const
                 { return this->players_.size(); }
-
-            inline std::string getPlayersName() const
-                { return "StatsBot77"; }
-
-            inline unsigned int getPlayersFrags() const
-                { return 123; }
 
         private:
@@ -131 +132 @@
             unsigned int numberOfBots_;
 
-            std::map<PlayerInfo*, PlayerState::Enum> players_;
+            std::map<PlayerInfo*, Player> players_;
             std::set<SpawnPoint*> spawnpoints_;
             SubclassIdentifier<ControllableEntity> defaultControllableEntity_;
 
-            XMLFile* statsOverlay_;
+            OverlayGroup* scoreboard_;
 
             // Config Values
-            std::string statsOverlayName_;
+            std::string scoreboardTemplate_;
     };
 }