Changeset 9016 for code/trunk/src/orxonox/gametypes

Timestamp:

Feb 15, 2012, 11:51:58 PM (13 years ago)

Author:

jo

Message:

Merging presentation2011 branch to trunk. Please check for possible bugs.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gametypes/Gametype.cc (modified) (8 diffs)
• src/orxonox/gametypes/Gametype.h (modified) (3 diffs)
• src/orxonox/gametypes/Mission.cc (copied) (copied from code/branches/presentation2011/src/orxonox/gametypes/Mission.cc)
• src/orxonox/gametypes/Mission.h (copied) (copied from code/branches/presentation2011/src/orxonox/gametypes/Mission.h)
• src/orxonox/gametypes/TeamDeathmatch.h (modified) (1 diff)
• src/orxonox/gametypes/TeamGametype.cc (copied) (copied from code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc)
• src/orxonox/gametypes/TeamGametype.h (copied) (copied from code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.h)
• src/orxonox/gametypes/UnderAttack.cc (modified) (1 diff)

code/trunk/src/orxonox/gametypes/CMakeLists.txt

@@ -9 +9 @@
   LastManStanding.cc
   LastTeamStanding.cc
+  TeamGametype.cc
+  Mission.cc
 )

code/trunk/src/orxonox/gametypes/Gametype.cc

@@ -123 +123 @@
         if (this->gtinfo_->isStartCountdownRunning() && !this->gtinfo_->hasStarted())
             this->gtinfo_->countdownStartCountdown(dt);
-
+                        
         if (!this->gtinfo_->hasStarted())
         {
@@ -131 +131 @@
                 if(it->first->isHumanPlayer() && it->first->isReadyToSpawn())
                     this->gtinfo_->playerReadyToSpawn(it->first);
-            }
-                    
+                   
+                
+            }
             this->checkStart();
         }
@@ -143 +144 @@
     void Gametype::start()
     {
+         
         this->addBots(this->numberOfBots_);
 
@@ -148 +150 @@
 
         this->spawnPlayersIfRequested();
+        
+        
     }
 
@@ -376 +380 @@
                 {
                     this->gtinfo_->stopStartCountdown();
-                    this->gtinfo_->setStartCountdown(0.0f);;
+                    this->gtinfo_->setStartCountdown(0.0f);
                     this->start();
                 }
@@ -397 +401 @@
                             hashumanplayers = true;
                     }
+                         
                     if (allplayersready && hashumanplayers)
                     {
@@ -408 +413 @@
                 }
             }
+            
         }
     }
@@ -439 +445 @@
             if(player->isHumanPlayer())
                 this->gtinfo_->playerSpawned(player);
-            
+
             this->playerPostSpawn(player);
         }

code/trunk/src/orxonox/gametypes/Gametype.h

@@ -123 +123 @@
                 { return this->gtinfo_->getHUDTemplate(); }
 
-            void addBots(unsigned int amount);
+            virtual void addBots(unsigned int amount);
             void killBots(unsigned int amount = 0);
-
-            inline unsigned int getNumberOfPlayers() const
-                { return this->players_.size(); }
 
             virtual void addTime(float t);
@@ -151 +148 @@
 
             //inline bool getForceSpawn()
-            //  { return this->bForceSpawn_; }       
+            //  { return this->bForceSpawn_; }
 
             virtual void resetTimer();
             virtual void resetTimer(float t);
+            inline unsigned int getNumberOfPlayers()
+              { return this->gtinfo_->getNumberOfPlayers(); }
+
+        
 
         protected:
@@ -192 +193 @@
             ConsoleCommand* dedicatedKillBots_;
             /* HACK HACK HACK */
+
     };
 }

code/trunk/src/orxonox/gametypes/TeamDeathmatch.h

@@ -56 +56 @@
 
             int getTeam(PlayerInfo* player);
-
             inline const ColourValue& getTeamColour(int teamnr) const
                 { return this->teamcolours_[teamnr]; }

code/trunk/src/orxonox/gametypes/UnderAttack.cc

@@ -49 +49 @@
         this->gameEnded_ = false;
 
-        this->setHUDTemplate("UnderAttackHUD");
-
+        //this->setHUDTemplate("UnderAttackHUD"); 
+        //This HUD is in conflict with the HUDEnemyHealthBar
         this->setConfigValues();
         this->timesequence_ = static_cast<int>(this->gameTime_);