Changeset 11986 for code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.cc

Timestamp:

May 24, 2018, 3:03:31 PM (6 years ago)

Author:

arismu

Message:

messages

File:

• code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.cc (modified) (3 diffs)

code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.cc

@@ -107 +107 @@
         return returnVec;
     }
-    /*void SpaceRaceController::endtheGame() const {
+    void SpaceRaceController::endtheGame() const {
         SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype());
-        assert(gametype);
-        if (!gametype)
+        assert(gametype)
+;        if (!gametype)
         return;
+        gametype->bLost=true;
         gametype->end();
 
-    }*/
+    }
     /*
      * called from 'findStaticCheckpoints'
@@ -176 +177 @@
         {
             RaceCheckPoint* nextRaceCheckPoint = findCheckpoint(checkpointIndex);
+
             float distance = recCalculateDistance(nextRaceCheckPoint, this->getControllableEntity()->getPosition());
 
@@ -184 +186 @@
 
             }
-
-        }
-        if(minNextRaceCheckPoint == nullptr) { orxout()<<"nullptr found @181 SpaceRaceController" << endl;}
+            //There is a bug. If the user passes through the 19th checkpoint with the opponents, the game will end immediately
+            if(nextRaceCheckPoint->isLast())
+                endtheGame(); 
+
+        }
+        if(minNextRaceCheckPoint == nullptr) { orxout()<<"nullptr found @192 SpaceRaceController" << endl;}
         return minNextRaceCheckPoint;
     }