Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
committerStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
commitf030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch)
treecd92baf9e4fa8a136523b9eb570e9811846c9250 /src/game/base/racetrack.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/game/base/racetrack.h')
-rw-r--r--src/game/base/racetrack.h21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/game/base/racetrack.h b/src/game/base/racetrack.h
index 80a5766..ef7375a 100644
--- a/src/game/base/racetrack.h
+++ b/src/game/base/racetrack.h
@@ -1,7 +1,7 @@
/*
base/racetrack.h
- This file is part of the Osirion project and is distributed under
- the terms and conditions of the GNU General Public License version 2
+ This file is part of the Osirion project and is distributed under
+ the terms and conditions of the GNU General Public License version 2
*/
#ifndef __INCLUDED_BASE_RACETRACK_H__
@@ -13,14 +13,16 @@
#include <string>
-namespace game {
+namespace game
+{
class CheckPoint;
/* ---- class RaceTrack -------------------------------------------- */
/// a race track entity
-class RaceTrack : public core::EntityDynamic {
+class RaceTrack : public core::EntityDynamic
+{
public:
/// default constructor
@@ -33,7 +35,9 @@ public:
typedef std::list<CheckPoint *> CheckPoints ;
/// the player who activated the race
- inline core::Player *player() { return track_player; }
+ inline core::Player *player() {
+ return track_player;
+ }
/// add a checkpoint to the racetrack
void add_checkpoint(CheckPoint *checkpoint);
@@ -46,20 +50,21 @@ public:
/// run one time frame
virtual void frame(float elapsed);
-
+
private:
CheckPoints track_checkpoints;
core::Player *track_player;
float track_racestart;
float track_checkpointtime;
CheckPoints::iterator track_checkpoint;
-
+
};
/* ---- class CheckPoint ------------------------------------------- */
/// a checkpoint for the race track
-class CheckPoint : public core::EntityDynamic {
+class CheckPoint : public core::EntityDynamic
+{
public:
CheckPoint(RaceTrack *parent);
~CheckPoint();