[Orxonox-commit 6641] r11279 - in code/branches/SpaceRace_HS16: data/levels src/modules/gametypes

[bberabi at orxonox.net]

Author: bberabi
Date: 2016-11-11 13:15:24 +0100 (Fri, 11 Nov 2016)
New Revision: 11279

Modified:
   code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
   code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceManager.cc
Log:
 

Modified: code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw	2016-11-08 08:05:10 UTC (rev 11278)
+++ code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw	2016-11-11 12:15:24 UTC (rev 11279)
@@ -181,7 +181,7 @@
     <?lua end ?>
 
    <!-- ------------------CheckPoints----------------- -->
-   <!--OldRaceCheckPoint name="checkpoint1" yaw=90 pitch=90 position="1000,30,0" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false">
+   <OldRaceCheckPoint name="checkpoint1" yaw=90 pitch=90 position="1000,30,0" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false">
         <attached>
             <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
         </attached>

Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceManager.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceManager.cc	2016-11-08 08:05:10 UTC (rev 11278)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceManager.cc	2016-11-11 12:15:24 UTC (rev 11279)
@@ -46,8 +46,8 @@
     {
         RegisterObject(SpaceRaceManager);
         this->race_ = orxonox_cast<SpaceRace*>(this->getGametype());
-        //assert(race_);
-        //amountOfPlayers=(race_->getPlayers()).size();
+        assert(race_);
+        amountOfPlayers=(race_->getPlayers()).size();
         this->firstcheckpointvisible_ = false;
     }