Changeset 8930

Timestamp:

Nov 9, 2011, 4:16:24 PM (12 years ago)

Author:

jo

Message:

Adding some variables.

Location:

code/branches/gamecontent/src/orxonox

Files:

• gametypes/Gametype.cc (modified) (1 diff)
• gametypes/Gametype.h (modified) (2 diffs)
• gametypes/TeamGametype.cc (modified) (3 diffs)
• gametypes/TeamGametype.h (modified) (3 diffs)
• infos/GametypeInfo.h (modified) (1 diff)

code/branches/gamecontent/src/orxonox/gametypes/Gametype.cc

@@ -85 +85 @@
         this->dedicatedKillBots_ = createConsoleCommand( "dedicatedKillBots", createExecutor( createFunctor(&Gametype::killBots, this) ) );
         /* HACK HACK HACK */
+        //this->numberOfPlayers_ = 0;
     }
 

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

@@ -155 +155 @@
             virtual void resetTimer();
             virtual void resetTimer(float t);
+            inline unsigned int getNumberOfPlayers()
+              { return this->gtinfo_->getNumberOfPlayers(); }
 
         protected:
@@ -192 +194 @@
             ConsoleCommand* dedicatedKillBots_;
             /* HACK HACK HACK */
+
     };
 }

code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "infos/PlayerInfo.h"
 #include "interfaces/TeamColourable.h"
 #include "worldentities/TeamSpawnPoint.h"
@@ -45 +46 @@
         this->teams_ = 2;
         this->allowFriendlyFire_ = false;
-
+        //this->playersPerTeam_ = 0;
+        this->maxPlayers_ = 0;
         this->setConfigValues();
     }
@@ -104 +106 @@
     }
 
+    void TeamGametype::spawnDeadPlayersIfRequested()
+    {
+        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end();
+++it)
+        if (it->second.state_ == PlayerState::Dead)
+        {
+         if ((it->first->isReadyToSpawn() || this->bForceSpawn_))
+            {
+               this->spawnPlayer(it->first);
+            }
+        }
+    }
+
+
     bool TeamGametype::allowPawnHit(Pawn* victim, Pawn* originator)
     {// hit allowed: if victim & originator are foes or if originator doesnot exist or if friendlyfire is allowed 

code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h

@@ -49 +49 @@
             virtual void findAndSetTeam(PlayerInfo* player);
             virtual bool playerLeft(PlayerInfo* player);
+            virtual void spawnDeadPlayersIfRequested(); //!< Prevents players to respawn.
 
             virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);
@@ -55 +56 @@
 
             virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
+
 
             int getTeam(PlayerInfo* player);
@@ -68 +70 @@
             std::map<PlayerInfo*, int> teamnumbers_;
             std::vector<ColourValue> teamcolours_;
-            unsigned int teams_;
+            unsigned int teams_; //<! Number  of teams. Value 0 : no teams!
+            //unsigned int playersPerTeam_; //<! Defines Maximum for players per team. Value 0: no maximum!
+            unsigned int maxPlayers_;  //<! Defines Maximum for number of players. Value 0 : no maximum!
     };
 }

code/branches/gamecontent/src/orxonox/infos/GametypeInfo.h

@@ -119 +119 @@
             inline const std::string& getHUDTemplate() const
                 { return this->hudtemplate_; }
+            
+            inline unsigned int getNumberOfPlayers() const
+                {  return this->spawnedPlayers_.size(); }
 
             void sendAnnounceMessage(const std::string& message);