Fixed issue where buttons to change throttle weren't working unless t…

…here was at least one axis defined
linuxgurugamer · Dec 28, 2022 · 8584f71 · 8584f71
1 parent 848f38f
commit 8584f71
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 17 deletions.
diff --git a/AFBW/AssemblyVersion.cs b/AFBW/AssemblyVersion.cs
@@ -5,5 +5,5 @@
 
  using System.Reflection;
 
- [assembly: AssemblyVersion("1.8.3.7")]
- [assembly: AssemblyFileVersion("1.8.3.7")]
+ [assembly: AssemblyVersion("1.8.4.0")]
+ [assembly: AssemblyFileVersion("1.8.4.0")]
diff --git a/AFBW/ControllerPreset.cs b/AFBW/ControllerPreset.cs
@@ -204,7 +204,7 @@ public void OnPreSerialize()
         public void OnPostDeserialize()
         {
             continuousActionsMap.Clear();
-            foreach(var entry in serialiazableContinuousActionList)
+            foreach(ContinuousActionEntry entry in serialiazableContinuousActionList)
             {
                 continuousActionsMap.Add(entry.Action, entry);
             }

diff --git a/AFBW/DefaultControllerPresets.cs b/AFBW/DefaultControllerPresets.cs
@@ -25,8 +25,9 @@ public static ControllerPreset GetXInputDefaultRocketPreset(IController controll
         {
             ControllerPreset preset = new ControllerPreset();
             preset.name = "XInput Default";
-            
+
 #if !LINUX && !OSX
+
             int buttonsCount = controller.GetButtonsCount();
 
             preset.SetDiscreteBinding(new Bitset(buttonsCount, (int)XInput.Button.DPadLeft), DiscreteAction.SAS);

diff --git a/AFBW/FlightManager.cs b/AFBW/FlightManager.cs
@@ -55,12 +55,14 @@ public void OnFlyByWire(FlightCtrlState state)
             m_Throttle.SetMinMaxValues(-state.mainThrottle, 1.0f - state.mainThrottle);
             m_WheelThrottle.SetMinMaxValues(-1.0f, 1.0f);
 
+
             foreach (ControllerConfiguration config in m_Configuration.controllers)
             {
                 if (config.isEnabled && !AdvancedFlyByWire.rightClickDisabled)
                 {
-                    config.iface.Update(state);
+                    throttleActive = true;
                     UpdateAxes(config, state);
+                    config.iface.Update(state);
 
                     if (FlightGlobals.ActiveVessel.isEVA)
                     {
@@ -116,21 +118,20 @@ private void UpdateAxes(ControllerConfiguration config, FlightCtrlState state)
 
                 float axisState = config.iface.GetAxisState(i);
 
-                foreach (var action in actions)
+                foreach (ContinuousAction action in actions)
                 {
                     var axisValue = axisState;
                     if (config.GetCurrentPreset().IsContinuousBindingInverted(action))
                     {
                         axisValue *= -1.0f;
                     }
 
-
                     throttleActive = true;
                     if (!AdvancedFlyByWire.Instance.settings.m_ThrottleOverride && action == ContinuousAction.Throttle)
                     {
                         if (axisValue == last_m_throttle)
                         {
-                            throttleActive = false;
+                            //throttleActive = false;
                         }
                         else
                         {

diff --git a/AFBW/PresetEditorWindowNG.cs b/AFBW/PresetEditorWindowNG.cs
@@ -123,10 +123,10 @@ public void DoChooseDiscreteActionWindow(int window)
 
         public void DoChooseContinuousActionWindow(int window)
         {
-            if (!m_ChooseContinuousAction)
-            {
-                return;
-            }
+            //if (!m_ChooseContinuousAction)
+            //{
+            //    return;
+            //}
             GUILayout.BeginHorizontal();
             var currentPreset = m_Controller.GetCurrentPreset();
             GUILayout.FlexibleSpace();

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 ChangeLog
 
+1.8.4.1
+	Fixed issue where buttons to change throttle weren't working unless there was at least one axis defined
+
 1.8.4
 	Thanks to github user @AlexanderDzhoganov for this:
 		Add support for Custom Axis Groups

diff --git a/GameData/ksp-advanced-flybywire/Plugins/AdvancedFlyByWire.dll b/GameData/ksp-advanced-flybywire/Plugins/AdvancedFlyByWire.dll
diff --git a/GameData/ksp-advanced-flybywire/Plugins/AdvancedFlyByWire.pdb b/GameData/ksp-advanced-flybywire/Plugins/AdvancedFlyByWire.pdb
diff --git a/GameData/ksp-advanced-flybywire/ksp-advanced-flybywire.version b/GameData/ksp-advanced-flybywire/ksp-advanced-flybywire.version
@@ -9,13 +9,13 @@
   "VERSION": {
     "MAJOR": 1,
     "MINOR": 8,
-    "PATCH": 3,
-    "BUILD": 7
+    "PATCH": 4,
+    "BUILD": 0
   },
   "KSP_VERSION": {
     "MAJOR": 1,
     "MINOR": 12,
-    "PATCH": 0
+    "PATCH": 4
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,

diff --git a/deploy.bat b/deploy.bat
@@ -8,6 +8,7 @@ rem VERSIONFILE is the name of the version file, usually the same as GAMEDATA,
 rem    but not always
 
 set H=%KSPDIR%
+
 set GAMEDIR=ksp-advanced-flybywire
 set GAMEDATA="GameData"
 set SUPPORTFILES=SUPPORTFILES
@@ -23,4 +24,4 @@ copy /Y %VERSIONFILE% %GAMEDATA%\%GAMEDIR%
 xcopy /y /s /I %GAMEDATA%\%GAMEDIR% "%H%\GameData\%GAMEDIR%"
 xcopy /y /s /I %GAMEDATA%\%GAMEDIR% "%DP0%\GameData\%GAMEDIR%"
 
-pause
+rem pause
diff --git a/ksp-advanced-flybywire.version b/ksp-advanced-flybywire.version
@@ -10,7 +10,7 @@
     "MAJOR": 1,
     "MINOR": 8,
     "PATCH": 4,
-    "BUILD": 0
+    "BUILD": 1
   },
   "KSP_VERSION": {
     "MAJOR": 1,