Tentatively add Enforced Unmodded analog option

Its main flaw is that if your aim is slighty off when aiming, say, directly forwards, then you will only be going 99% forwards, limiting your speed. It is hidden in the menu for the moment
MBU-Team · Mar 3, 2024 · e6507a5 · e6507a5
1 parent 4a015fb
commit e6507a5
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/engine/source/platformWin32/winDirectInput.cpp b/engine/source/platformWin32/winDirectInput.cpp
@@ -1042,6 +1042,22 @@ void DInputManager::processXInput(void)
                     mXInputStateNew[i].state.Gamepad.sThumbLX = 32767 * lx;
                     mXInputStateNew[i].state.Gamepad.sThumbLY = 32767 * ly;
                     break;
+                case 3:
+                    // Enforce Unmodded
+                    lx = (mXInputStateNew[i].state.Gamepad.sThumbLX / 32767.0f);
+                    ly = (mXInputStateNew[i].state.Gamepad.sThumbLY / 32767.0f);
+
+                    hypot = mSqrt(lx * lx + ly * ly);
+                    if (hypot > 1.0f)
+                    {
+                        ang = mAtan(ly, lx);
+                        lx = mCos(ang);
+                        ly = mSin(ang);
+
+                        mXInputStateNew[i].state.Gamepad.sThumbLX = 32767 * lx;
+                        mXInputStateNew[i].state.Gamepad.sThumbLY = 32767 * ly;
+                    }
+                    break;
                 default:
                     break;
             }

diff --git a/game/common/local/englishStrings.inf b/game/common/local/englishStrings.inf
@@ -326,7 +326,7 @@ $Text::InvY = "Camera Y-Axis";
 $Text::MouseSensitivity = "Mouse Sensitivity";
 $Text::InvOnOff = "Normal\tInverted";
 $Text::AnalogRange = "Analog Stick Range";
-$Text::AnalogRangeValues = "Normal\tModded\t8-way";
+$Text::AnalogRangeValues = "Normal\tModded\t8-way\tEnforce Unmodded";
 $Text::CenterCam = "Auto Center Camera";
 $Text::OptionOffOn = "Off\tOn";
 $Text::VideoOptions = "Video Options";

diff --git a/game/marble/client/ui/inputAndSoundOptionsGui.gui b/game/marble/client/ui/inputAndSoundOptionsGui.gui
@@ -88,6 +88,15 @@ function inputAndSoundOptionsList::onOptionChange(%this, %increase)
          $pref::Input::MouseSensitivity = mClamp((%val+2) * 0.05, 0.1, 1) * 0.01;
       case 5:
          // analog range
+         // Enforce Unmodded is flawed atm, so skip over that
+         if (%val == 3)
+         {
+            if (%increase)
+               %val = 0;
+            else
+               %val = 2;
+            %this.setOptionIndex(5, %val);
+         }
          $pref::Input::AnalogRange = %val;
       case 6:
          // auto center camera