Changeset 11986 for code

Timestamp:

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

Author:

arismu

Message:

messages

Location:

code/branches/RacingBots_FS18/src/modules/gametypes

Files:

• SpaceRace.cc (modified) (5 diffs)
• SpaceRace.h (modified) (2 diffs)
• SpaceRaceController.cc (modified) (3 diffs)
• SpaceRaceController.h (modified) (1 diff)

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

@@ -142 +142 @@
         }
 
-        std::string message("Use headphones to hear the countdown! Press W for forward acceleration, W+space bar for boost!");
+        std::string message("Use headphones to hear the countdown! Press W for forward acceleration, press W+space for boost!");
 
         this->getGametypeInfo()->sendAnnounceMessage(message);
@@ -191 +191 @@
         int ms = static_cast<int>(this->clock_.getMilliseconds() - 1000*s);
         std::string message;
-        message = multi_cast<std::string>(s)+"You could not reach the last checkpoint before your opponents. YOU LOOSE!";
-
         if (this->bTimeIsUp_)
         {
@@ -198 +196 @@
                         + "You loose!";
         }
+       else if(this->bLost){
+            message = multi_cast<std::string>(s)+"You could not reach the last checkpoint before your opponents. YOU LOOSE!";
+
+       }        
        
         else
@@ -207 +209 @@
         if (!this->hasEnded())
         {
+
             this->getGametypeInfo()->sendAnnounceMessage(message);
             ChatManager::message(message);
@@ -222 +225 @@
 
        
-    
-        const std::string& message = player->getName() + " reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1) 
+        std::string message(player->getName() + " reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1) 
+        + " after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.");
+
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+      /*  const std::string& message = player->getName() + " reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1) 
         + "after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.";
         this->getGametypeInfo()->sendAnnounceMessage(message);
-        ChatManager::message(message);
-        if(checkpoint->getCheckpointIndex()==20){
+        ChatManager::message(message);*/
+        if(checkpoint->getCheckpointIndex()==19){
              const std::string& message = player->getName() + " reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1) 
                 + "after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds and WON THE GAME.";

code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h

@@ -41 +41 @@
 
 #include "SpaceRaceManager.h"
+
 
 namespace orxonox
@@ -88 +89 @@
             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
             bool countdown_mode = false;
-            float time_passed = 4.0f;
+            float time_passed = 11.0f;
             
             bool bLost=false;

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;
     }

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

@@ -58 +58 @@
             RaceCheckPoint* nextPointFind(RaceCheckPoint*);
             RaceCheckPoint* adjustNextPoint();
-            //void endtheGame() const;
+            void endtheGame() const;
 
             std::vector<RaceCheckPoint*> findStaticCheckpoints(RaceCheckPoint*, const std::vector<RaceCheckPoint*>&);