Changeset 11977 for code/branches/RacingBots_FS18/src/modules

Timestamp:

May 17, 2018, 4:24:48 PM (7 years ago)

Author:

arismu

Message:

updated endthe
Game

Location:

code/branches/RacingBots_FS18/src/modules/gametypes

Files:

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

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

@@ -125 +125 @@
         {
             engine->setActive(false);
-            engine->setAccelerationFront(100.0f);
+            engine->addSpeedMultiply(1.7);
         }
 
@@ -186 +186 @@
     void SpaceRace::end()
     {
+        
         this->clock_.capture();
         int s = this->clock_.getSeconds();
         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_)
@@ -196 +198 @@
                         + "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
         {
@@ -203 +204 @@
                         + "." + multi_cast<std::string>(ms) + " seconds.";
         }
+        
         if (!this->hasEnded())
         {

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

@@ -107 +107 @@
         return returnVec;
     }
-
+    void SpaceRaceController::endtheGame() const {
+        SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype());
+        assert(gametype);
+        if (!gametype)
+        return;
+        gametype->end();
+
+    }
     /*
      * called from 'findStaticCheckpoints'
@@ -179 +186 @@
 
         }
-        if(minNextRaceCheckPoint == nullptr) orxout()<<"nullptr found @181 SpaceRaceController" << endl;
+        if(minNextRaceCheckPoint == nullptr) {endtheGame(); orxout()<<"nullptr found @181 SpaceRaceController" << endl;}
         return minNextRaceCheckPoint;
     }
@@ -233 +240 @@
     }
 
+
+
+
+    
+
     RaceCheckPoint* SpaceRaceController::findCheckpoint(int index) const
     {
+        RaceCheckPoint* res = nullptr;
         for (RaceCheckPoint* checkpoint : this->checkpoints_){
             //conclusion: index=20 is not 
             if (checkpoint->getCheckpointIndex() == index){
-                if(checkpoint == nullptr) orxout()<<"returned nullptr @line 234 SpaceRaceController"<<endl;
-                return checkpoint;
-            }
-        }
-
-        return nullptr;
-    }
+                //if(checkpoint == nullptr) orxout()<<"returned nullptr @line 234 SpaceRaceController"<<endl;
+                orxout()<< "index of the checkpoint "<< index <<endl;
+                res = checkpoint;
+                return res;
+            }
+        }
+     if(index>2 )   
+        this->endtheGame();
+
+        return res;
+    }
+    
+
 
     /*RaceCheckPoint* SpaceRaceController::addVirtualCheckPoint( RaceCheckPoint* previousCheckpoint, int indexFollowingCheckPoint , const Vector3& virtualCheckPointPosition )
@@ -299 +318 @@
     void SpaceRaceController::tick(float dt)
     {
+        
+
         if (this->getControllableEntity() == nullptr || this->getControllableEntity()->getPlayer() == nullptr )
         {
@@ -361 +382 @@
         // }
 
+        
         this->moveToPosition(nextRaceCheckpoint_->getPosition());
 

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

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