diff options
author | Stijn Buys <ingar@osirion.org> | 2013-11-12 21:09:30 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2013-11-12 21:09:30 +0000 |
commit | f192b3019662e9ca6805992ba5e879e5b50b0958 (patch) | |
tree | 06b67d800eabfeb588c170017e1f6019487cd8de /src/core/player.h | |
parent | ad8f2fe096b2bca7294f07635675f30b94b2977a (diff) |
Support for player autopilot terget next to mission target,
bumped network protocol version to 28,
disable freeflight button if there is no autopilot target.
Diffstat (limited to 'src/core/player.h')
-rw-r--r-- | src/core/player.h | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/src/core/player.h b/src/core/player.h index 8d614ee..a9eb4b0 100644 --- a/src/core/player.h +++ b/src/core/player.h @@ -89,10 +89,20 @@ public: return player_rconpassword; } - /// mission target + /** + * @brief current mission target + * */ inline Entity *mission_target() { return player_mission_target; } + + /** + * @brief current autopilot target + * */ + /// mission target + inline Entity *autopilot_target() { + return player_autopilot_target; + } /// view inline Entity *view() { @@ -245,8 +255,17 @@ public: */ void set_control(EntityControlable *entitycontrolable); - /// set mission target + /** + * @brief set current mission target + * This will set dirty() if new_mission_target differs from mission_target() + * */ void set_mission_target(Entity *new_mission_target); + + /** + * @brief set current autopilot target + * This will set dirty() if new_autopilot_target differs from autopilot_target() + * */ + void set_autopilot_target(Entity *new_autopilot_target); /// set the current view void set_view(Entity *view); @@ -331,6 +350,9 @@ private: // current mission target Entity *player_mission_target; + + // current autopilot target + Entity *player_autopilot_target; // the zone the player is currently in Zone *player_zone; |