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/game.cc')
-rw-r--r--src/game/base/game.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index 96c0835..729e4f8 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -200,7 +200,6 @@ void Game::func_buy(core::Player *player, const std::string &args)
aux::to_label(labelstr);
}
-
if (typestr.compare("ship") == 0) {
ShipDealer::func_buy(player, labelstr);
} else {
@@ -229,7 +228,7 @@ void Game::func_launch(core::Player *player, std::string const &args)
core::Entity *dock = player->view();
if (dock->type() == core::Entity::Globe)
- ship->get_location().assign(dock->location() + (dock->axis().forward() *(Planet::safe_distance + ship->radius() + dock->radius())));
+ ship->get_location().assign(dock->location() + (dock->axis().forward() *(planet_safe_distance + ship->radius() + dock->radius())));
else
ship->get_location().assign(dock->location() + (dock->axis().forward() *(ship->radius() + dock->radius())));
@@ -299,7 +298,7 @@ void Game::func_goto(core::Player *player, const std::string &args)
ship->shutdown_physics();
if (dock->type() == core::Entity::Globe)
- ship->get_location().assign(dock->location() + (dock->axis().forward() *(Planet::safe_distance + ship->radius() + dock->radius())));
+ ship->get_location().assign(dock->location() + (dock->axis().forward() *(planet_safe_distance + ship->radius() + dock->radius())));
else
ship->get_location().assign(dock->location() + (dock->axis().forward() *(ship->radius() + dock->radius())));