diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-10-17 17:19:03 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-10-17 17:19:03 +0000 |
| commit | d6e4c4e7c2b1e28961f1dfe2f25ef96ced60b21b (patch) | |
| tree | 63744dff093a8b23f65d9c68b922b678805647d9 /src/game/base/game.cc | |
| parent | ea6e6bb769d713ac55114c1940626f13e384ebed (diff) | |
core bullet physics support,
initial vstrafe support
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 3c84d58..c0ef4ce 100644 --- a/src/game/base/game.cc +++ b/src/game/base/game.cc @@ -604,7 +604,7 @@ void Game::func_launch(core::Player *player, std::string const &args) ship->get_axis().assign(dock->axis()); ship->set_state(core::Entity::Normal); - ship->set_state(core::Entity::Jump); + ship->reset(); player->set_view(0); player->send("^BLaunching from " + dock->name()); @@ -671,8 +671,7 @@ void Game::func_goto(core::Player *player, const std::string &args) ship->get_axis().assign(dock->axis()); ship->get_axis().change_direction(180.0f); ship->set_state(core::Entity::Normal); - - ship->set_state(core::Entity::Jump); + ship->reset(); player->set_view(0); player->send("Going to " + dock->name()); |