Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2015-02-28 22:39:18 +0000
committerStijn Buys <ingar@osirion.org>2015-02-28 22:39:18 +0000
commit9a5af746d505625d49130d74da61a59af8cda4a4 (patch)
treee6341fbfa0baff9f17484dc7736eb0d807ead0fc
parent3fc2e602f059dee3f92a9f0063f43eecccb48a1f (diff)
Corrected HUD autopilot button status.
-rw-r--r--src/client/hudenginestatus.cc2
-rw-r--r--src/client/input.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/client/hudenginestatus.cc b/src/client/hudenginestatus.cc
index 0eeafba..ab51709 100644
--- a/src/client/hudenginestatus.cc
+++ b/src/client/hudenginestatus.cc
@@ -95,7 +95,7 @@ void HUDEngineStatus::draw()
// autopilot and control lock buttons
// see HUD::draw()
- const bool control_lock = !input::mouse_control;
+ const bool control_lock = !core::localcontrol()->has_target_controlflag(core::EntityControlable::ControlFlagOverride);
if (core::localplayer()->autopilot_target())
{
diff --git a/src/client/input.cc b/src/client/input.cc
index dadc027..85d8526 100644
--- a/src/client/input.cc
+++ b/src/client/input.cc
@@ -1076,7 +1076,8 @@ void frame()
break;
}
- } else if (mouse_control)
+ }
+ else if (mouse_control)
{
// mouse is controling direction
switch (render::camera().mode())