Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/base/racetrack.cc')
-rw-r--r--src/game/base/racetrack.cc19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/game/base/racetrack.cc b/src/game/base/racetrack.cc
index 3d1cb69..51526ea 100644
--- a/src/game/base/racetrack.cc
+++ b/src/game/base/racetrack.cc
@@ -1,7 +1,7 @@
/*
base/racetrack.cc
- 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
*/
#include <string>
@@ -11,7 +11,8 @@
#include "base/racetrack.h"
#include "core/gameserver.h"
-namespace game {
+namespace game
+{
/* ---- class CheckPoint ------------------------------------------- */
@@ -31,7 +32,7 @@ CheckPoint::CheckPoint(RaceTrack *parent)
CheckPoint::~CheckPoint()
{
-
+
}
/* ---- class RaceTrack -------------------------------------------- */
@@ -64,7 +65,7 @@ void RaceTrack::reset()
track_player = 0;
track_racestart = 0;
track_checkpointtime = 0;
-
+
for (CheckPoints::iterator cpit = track_checkpoints.begin(); cpit != track_checkpoints.end(); ++cpit) {
(*cpit)->set_state(core::Entity::NoPower);
}
@@ -74,7 +75,7 @@ void RaceTrack::reset()
void RaceTrack::dock(core::Entity *entity)
{
-
+
if (entity->moduletype() != ship_enttype)
return;
Ship * ship = static_cast<Ship *>(entity);
@@ -96,7 +97,7 @@ void RaceTrack::dock(core::Entity *entity)
for (CheckPoints::iterator cpit = track_checkpoints.begin(); cpit != track_checkpoints.end(); ++cpit) {
set_state(core::Entity::Normal);
}
-
+
entity_timer = 5.0f;
std::string message("^B" + track_player->name() + " ^Bactivated the race! Race starts in 5...");
core::server()->broadcast(message);
@@ -163,7 +164,7 @@ void RaceTrack::frame(float seconds)
track_player->set_mission_target((*track_checkpoint));
}
}
-
+
} else {
@@ -192,7 +193,7 @@ void RaceTrack::frame(float seconds)
} else {
std::stringstream msgstr;
- msgstr << "^BRace completed in " << core::server()->time() - track_racestart << " seconds!";
+ msgstr << "^BRace completed in " << core::server()->time() - track_racestart << " seconds!";
core::server()->broadcast(msgstr.str());
// prize money