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

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/infos/GametypeInfo.cc (modified) (2 diffs)
• src/orxonox/infos/GametypeInfo.h (modified) (1 diff)
• src/orxonox/infos/PlayerInfo.cc (modified) (3 diffs)

code/trunk/src/orxonox/infos/GametypeInfo.cc

@@ -71 +71 @@
         this->bStarted_ = false;
         this->bEnded_ = false;
-        this->startCountdown_ = 0.0f;
+        this->startCountdown_ = 10.0f;
         this->bStartCountdownRunning_ = false;
-        this->counter_ = 0;
+        this->counter_ = 10;
         this->spawned_ = false;
         this->readyToSpawn_ = false;
@@ -164 +164 @@
     {
         if(this->bStarted_)
-            return;
+           { return;}
         
         this->bStarted_ = true;
         this->changedStarted();
+        
+       
     }
 

code/trunk/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);

code/trunk/src/orxonox/infos/PlayerInfo.cc

@@ -36 +36 @@
 #include "worldentities/ControllableEntity.h"
 #include "controllers/Controller.h"
+#include "worldentities/pawns/SpaceShip.h"
 
 namespace orxonox
@@ -57 +58 @@
 
         this->registerVariables();
+        
     }
 
@@ -170 +172 @@
 
         this->changedControllableEntity();
+                SpaceShip* spaceship = dynamic_cast<SpaceShip*>(entity);
+        if (spaceship != NULL)
+        {
+            spaceship->setRVName(this->getName());
+        }
     }