diff options
| author | Stijn Buys <ingar@osirion.org> | 2012-10-11 19:47:30 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2012-10-11 19:47:30 +0000 |
| commit | b0d67843c43f50f36a92c4b8694b3df380ce50b1 (patch) | |
| tree | bce9b7e4c30862a411909a96b2d7b298c9e0999f /src/game/base/ship.h | |
| parent | 529e80912f5a62eba69190aadf026a6cf1e27ea4 (diff) | |
Moved handling of the physics reset for the Docked and Destroyed state from game tp core.
Diffstat (limited to 'src/game/base/ship.h')
| -rw-r--r-- | src/game/base/ship.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game/base/ship.h b/src/game/base/ship.h index f705231..230d406 100644 --- a/src/game/base/ship.h +++ b/src/game/base/ship.h @@ -115,7 +115,7 @@ public: /// Initiate jump, departing from a jump point void initiate_jump(JumpPoint *depart); - /// void reset drive controls + /// reset physics state and ship controls virtual void reset(); /// explode the ship @@ -127,7 +127,6 @@ public: /// toggle jump drive activation void func_jump(std::string const & args); - virtual void set_state(int state); /** * @brief dock the ship at a station, planet or another player's ship_dock * This will set the ship's state to Entity::Docked and reset spawn if required |