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/station.cc
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/game/base/station.cc')
-rw-r--r--src/game/base/station.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/game/base/station.cc b/src/game/base/station.cc
index 0552269..fb548bb 100644
--- a/src/game/base/station.cc
+++ b/src/game/base/station.cc
@@ -1,14 +1,15 @@
/*
base/station.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 "base/game.h"
#include "base/station.h"
#include "sys/sys.h"
-namespace game {
+namespace game
+{
Station::Station() : Entity(), PhysicsBody(this)
{
@@ -51,7 +52,7 @@ void Station::dock(core::Entity *entity)
ship->get_location().assign(entity->location());
ship->set_state(core::Entity::Docked);
- if (ship->owner() && ship->owner()->control() == ship) {
+ if (ship->owner() && ship->owner()->control() == ship) {
ship->owner()->set_view(this);
ship->owner()->send("^BDocking at " + name());
}