From f612f19e095b8d0ba49f5bcdec6a582824315d69 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 13 Mar 2010 13:03:33 +0000 Subject: small OS X build fixes ShipModel::search cleanup --- src/game/base/game.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/game/base/game.cc') 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()))); -- cgit v1.2.3