- Timestamp:
- Oct 10, 2018, 3:36:53 PM (6 years ago)
- Location:
- code/branches/mergeFS18
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mergeFS18
- Property svn:mergeinfo changed
/code/branches/RacingBots_FS18 (added) merged: 11817,11840-11841,11857,11860,11893,11912-11913,11938,11964-11969,11977,11982,11986,11989,11997
- Property svn:mergeinfo changed
-
code/branches/mergeFS18/src/modules/gametypes/SpaceRace.h
r11720 r12029 42 42 #include "SpaceRaceManager.h" 43 43 44 44 45 namespace orxonox 45 46 { … … 54 55 55 56 public: 56 SpaceRace(Context* context); 57 SpaceRace(Context* context);//, SpaceRace* parentRace); 57 58 virtual ~SpaceRace() {} 58 59 … … 60 61 virtual void end() override; 61 62 virtual void countdownFinished(); 63 62 64 virtual void addBots(unsigned int amount) override; //<! overwrite function in order to bypass the addbots command. 65 virtual void tick(float dt) override; 66 virtual void startmessage(int second); 63 67 64 68 … … 79 83 inline Clock& getClock() 80 84 { return this->clock_; } 85 //inline void setParentRace(SpaceRace* parentRace) { this->parentRace = parentRace; } 81 86 82 87 virtual bool allowPawnHit(Pawn* victim, Pawn* originator) override; 83 88 virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override; 84 89 virtual bool allowPawnDeath(Pawn* victim, Pawn* originator) override; 90 bool countdown_mode = false; 91 float time_passed = 11.0f; 92 93 bool bLost=false; 85 94 86 95 private: 87 96 bool cantMove_; ///< Helper variable, used to stall the engines before the race starts. 88 97 std::map<PlayerInfo*, RaceCheckPoint*> checkpointReached_; ///< The number of the last check point reached by each player. 89 bool bTimeIsUp_; 98 bool bTimeIsUp_; ///< True if one of the check points is reached too late. 90 99 91 100 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.
Note: See TracChangeset
for help on using the changeset viewer.