- Timestamp:
- Oct 10, 2018, 3:36:53 PM (5 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/SpaceRaceController.h
r11099 r12029 47 47 { 48 48 public: 49 SpaceRaceController(Context* context); 49 SpaceRaceController(Context* context);//, SpaceRace* parentRace); 50 50 virtual ~SpaceRaceController(); 51 51 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 52 52 virtual void tick(float dt) override; 53 53 54 54 55 private: … … 57 58 RaceCheckPoint* nextPointFind(RaceCheckPoint*); 58 59 RaceCheckPoint* adjustNextPoint(); 60 void endtheGame() const; 61 59 62 std::vector<RaceCheckPoint*> findStaticCheckpoints(RaceCheckPoint*, const std::vector<RaceCheckPoint*>&); 60 63 std::vector<RaceCheckPoint*> staticCheckpoints(); … … 74 77 Vector3 lastPositionSpaceship; 75 78 int virtualCheckPointIndex; 79 //SpaceRace* parentRace; 76 80 }; 77 81
Note: See TracChangeset
for help on using the changeset viewer.