Changeset 9260 for code/trunk/src/orxonox

Timestamp:

Jun 2, 2012, 10:34:48 PM (13 years ago)

Author:

landauf

Message:

cleaned up new SpaceRace classes (no functional code-changes):

• formatting
• naming of variables, arguments, functions
• unused and duplicate code
• public member variables

Location:

code/trunk/src/orxonox/gametypes

Files:

• Gametype.cc (modified) (6 diffs)
• Gametype.h (modified) (1 diff)

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();
         }
@@ -144 +143 @@
     void Gametype::start()
     {
-         
         this->addBots(this->numberOfBots_);
 
@@ -150 +148 @@
 
         this->spawnPlayersIfRequested();
-        
-        
     }
 
@@ -401 +397 @@
                             hashumanplayers = true;
                     }
-                         
+
                     if (allplayersready && hashumanplayers)
                     {
@@ -413 +409 @@
                 }
             }
-            
         }
     }

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

@@ -152 +152 @@
             virtual void resetTimer();
             virtual void resetTimer(float t);
-            inline unsigned int getNumberOfPlayers()
-              { return this->gtinfo_->getNumberOfPlayers(); }
 
-        
+            inline unsigned int getNumberOfPlayers() const
+                { return this->gtinfo_->getNumberOfPlayers(); }
 
         protected: