Changeset 9338 for code/branches/presentation2012merge/src

Timestamp:

Jul 30, 2012, 9:25:47 PM (12 years ago)

Author:

jo

Message:

Trying to find quick fixes for dynamic match. Somehow gametypes getNumberOfPlayer() function is broken, so I created a new, local function. Furthermore the rocket usage is in conflict with colouring spaceships, so I changed the spaceship model. Surprisingly the usage of spaceshipswallow and adding 7 bots caused my system to freeze some seconds after the gametype started.

Location:

code/branches/presentation2012merge/src/orxonox/gametypes

Files:

• Dynamicmatch.cc (modified) (3 diffs)
• Dynamicmatch.h (modified) (1 diff)

code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc

@@ -82 +82 @@
         this->numberOf[killer]=0;
         this->tutorial=true;
-        this->pointsPerTime=0.0f;
+        this->pointsPerTime=1.0f;
         this->setHUDTemplate("DynamicmatchHUD");
     }
@@ -453 +453 @@
     {
         //pigs: 1 + every 6th player is a pig
-        if ( (1+this->getNumberOfPlayers()/6) > numberOf[piggy])
+        if ( (1 + getPlayerCount()/6) > numberOf[piggy])
         {
             notEnoughPigs=true;
@@ -502 +502 @@
         }
         //killers: every 4th player is a killer
-        if (getNumberOfPlayers()/4 > numberOf[killer])
+        if (getPlayerCount()/4 > numberOf[killer])
         {
             notEnoughKillers=true;

code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.h

@@ -81 +81 @@
             SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
 
+
         protected:
+            inline int getPlayerCount() const
+                 { return this->numberOf[chaser] + numberOf[piggy] + this->numberOf[killer]; }
 
             std::map< PlayerInfo*, int > playerParty_; //player's parties are recorded here