[Orxonox-commit 7350] r11967 - code/branches/RacingBots_FS18/src/modules/gametypes

andera at orxonox.net andera at orxonox.net
Thu May 17 14:31:38 CEST 2018


Author: andera
Date: 2018-05-17 14:31:38 +0200 (Thu, 17 May 2018)
New Revision: 11967

Modified:
   code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h
Log:
SpaceRace.h updated

Modified: code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h
===================================================================
--- code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h	2018-05-17 12:30:20 UTC (rev 11966)
+++ code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h	2018-05-17 12:31:38 UTC (rev 11967)
@@ -53,7 +53,7 @@
 
 
         public:
-            SpaceRace(Context* context);
+            SpaceRace(Context* context);//, SpaceRace* parentRace);
             virtual ~SpaceRace() {}
 
             virtual void start() override;
@@ -81,6 +81,7 @@
                 { this->bTimeIsUp_ = true;}
             inline Clock& getClock()
                 { return this->clock_; }
+            //inline void setParentRace(SpaceRace* parentRace) { this->parentRace = parentRace; }
 
             virtual bool allowPawnHit(Pawn* victim, Pawn* originator) override;
             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
@@ -87,11 +88,13 @@
             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
             bool countdown_mode = false;
             float time_passed = 4.0f;
+            
+            bool bLost=false;
 
         private:
             bool cantMove_;                                            ///< Helper variable, used to stall the engines before the race starts.
             std::map<PlayerInfo*, RaceCheckPoint*> checkpointReached_; ///< The number of the last check point reached by each player.
-            bool bTimeIsUp_;                                           ///< True if one of the check points is reached too late.
+            bool bTimeIsUp_;    ///< True if one of the check points is reached too late.
 
             Clock clock_; ///< The clock starts running at the beginning of the game. It is used to give the time at each check point, the give the time at the end of the game, and to stop the game if a check point is reached too late.
     };



More information about the Orxonox-commit mailing list