diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-03-13 13:03:33 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-03-13 13:03:33 +0000 |
| commit | f612f19e095b8d0ba49f5bcdec6a582824315d69 (patch) | |
| tree | aa94da4a14254365ead88219726dcc0f3b2c4928 /src/game/base/game.cc | |
| parent | b16f437accb2db2effde95d7c6afa7dc5dd70bf6 (diff) | |
small OS X build fixes
ShipModel::search cleanup
Diffstat (limited to 'src/game/base/game.cc')
| -rw-r--r-- | src/game/base/game.cc | 5 |
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()))); |