diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
| commit | f030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch) | |
| tree | cd92baf9e4fa8a136523b9eb570e9811846c9250 /src/game/base/planet.cc | |
| parent | 5636fad174f0bcff857c357c394c4cc8d424b302 (diff) | |
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/game/base/planet.cc')
| -rw-r--r-- | src/game/base/planet.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/base/planet.cc b/src/game/base/planet.cc index b1ac976..f9535ba 100644 --- a/src/game/base/planet.cc +++ b/src/game/base/planet.cc @@ -8,7 +8,8 @@ #include "base/planet.h" -namespace game { +namespace game +{ Planet::Planet() : core::EntityGlobe(core::Entity::Static | core::Entity::Solid) { @@ -46,7 +47,7 @@ void Planet::dock(core::Entity *entity) Ship * ship = static_cast<Ship *>(entity); - if (math::distance(location(), ship->location()) > radius() + ship->radius() + 50.0f ) { + if (math::distance(location(), ship->location()) > radius() + ship->radius() + 50.0f) { if (ship->owner()) ship->owner()->send("Planet out of range"); return; @@ -55,7 +56,7 @@ void Planet::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()); } |