Changeset 9261 for code/trunk

Timestamp:

Jun 2, 2012, 10:46:25 PM (12 years ago)

Author:

landauf

Message:

fixed start-countdown issue in spacerace

Location:

code/trunk/src

Files:

• modules/gametypes/SpaceRace.cc (modified) (1 diff)
• modules/gametypes/SpaceRace.h (modified) (1 diff)
• orxonox/gametypes/Gametype.cc (modified) (1 diff)

code/trunk/src/modules/gametypes/SpaceRace.cc

@@ -74 +74 @@
     }
 
-    void SpaceRace::start()
-    {
-        this->spawnPlayersIfRequested();
-        Gametype::checkStart();
-        this->cantMove_ = true;
-
-        for (ObjectList<Engine>::iterator it = ObjectList<Engine>::begin(); it; ++it)
-            it->setActive(false);
-
-        this->addBots(this->numberOfBots_);
-    }
-
     void SpaceRace::tick(float dt)
     {
         SUPER(SpaceRace,tick,dt);
+
+        if (this->isStartCountdownRunning() && !this->cantMove_)
+        {
+            this->spawnPlayersIfRequested();
+            this->cantMove_ = true;
+
+            for (ObjectList<Engine>::iterator it = ObjectList<Engine>::begin(); it; ++it)
+                it->setActive(false);
+        }
 
         if (!this->isStartCountdownRunning() && this->cantMove_)

code/trunk/src/modules/gametypes/SpaceRace.h

@@ -59 +59 @@
             void tick(float dt);
 
-            virtual void start();
             virtual void end();
 

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

@@ -404 +404 @@
                             this->start();
                         else
+                        {
                             this->gtinfo_->setStartCountdown(this->initialStartCountdown_);
-                        this->gtinfo_->startStartCountdown();
+                            this->gtinfo_->startStartCountdown();
+                        }
                     }
                 }