From d5407e82daa768ceef45f6d8a662798a7a513507 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Wed, 9 Mar 2022 13:27:47 -0600
Subject: [PATCH 1/2] Vehicles - Mousewheel will set speed limiter value to
 multiples of 5

---
 addons/vehicles/XEH_postInit.sqf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/vehicles/XEH_postInit.sqf b/addons/vehicles/XEH_postInit.sqf
index 23b1a2b226c..5bc933f4b04 100644
--- a/addons/vehicles/XEH_postInit.sqf
+++ b/addons/vehicles/XEH_postInit.sqf
@@ -39,6 +39,9 @@ GVAR(isSpeedLimiter) = false;
 ["ACE3 Vehicles", QGVAR(scrollUp), localize LSTRING(IncreaseSpeedLimit), {
     if (GVAR(isSpeedLimiter)) then {
         GVAR(speedLimit) = round (GVAR(speedLimit) + GVAR(speedLimiterStep)) max (5 max GVAR(speedLimiterStep));
+        if (GVAR(speedLimiterStep) == 5) then { // round to nearest multiple of 5
+            GVAR(speedLimit) = 5 max GVAR(speedLimiterStep) * floor (GVAR(speedLimit) / GVAR(speedLimiterStep));
+        };
         [["%1: %2", LSTRING(SpeedLimit), GVAR(speedLimit)]] call EFUNC(common,displayTextStructured);
         true
     };
@@ -47,6 +50,9 @@ GVAR(isSpeedLimiter) = false;
 ["ACE3 Vehicles", QGVAR(scrollDown), localize LSTRING(DecreaseSpeedLimit), {
     if (GVAR(isSpeedLimiter)) then {
         GVAR(speedLimit) = round (GVAR(speedLimit) - GVAR(speedLimiterStep)) max (5 max GVAR(speedLimiterStep));
+        if (GVAR(speedLimiterStep) == 5) then { // round to nearest multiple of 5
+            GVAR(speedLimit) = 5 max GVAR(speedLimiterStep) * ceil (GVAR(speedLimit) / GVAR(speedLimiterStep));
+        };
         [["%1: %2", LSTRING(SpeedLimit), GVAR(speedLimit)]] call EFUNC(common,displayTextStructured);
         true
     };

From caf9b08ab5de8a36ae0b21ea5ebb5f474ee1ce1c Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Fri, 11 Mar 2022 13:16:32 -0600
Subject: [PATCH 2/2] Limit setting to whole numbers only

---
 addons/vehicles/XEH_postInit.sqf | 8 ++------
 addons/vehicles/initSettings.sqf | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/vehicles/XEH_postInit.sqf b/addons/vehicles/XEH_postInit.sqf
index 5bc933f4b04..0c27fcaf3dc 100644
--- a/addons/vehicles/XEH_postInit.sqf
+++ b/addons/vehicles/XEH_postInit.sqf
@@ -39,9 +39,7 @@ GVAR(isSpeedLimiter) = false;
 ["ACE3 Vehicles", QGVAR(scrollUp), localize LSTRING(IncreaseSpeedLimit), {
     if (GVAR(isSpeedLimiter)) then {
         GVAR(speedLimit) = round (GVAR(speedLimit) + GVAR(speedLimiterStep)) max (5 max GVAR(speedLimiterStep));
-        if (GVAR(speedLimiterStep) == 5) then { // round to nearest multiple of 5
-            GVAR(speedLimit) = 5 max GVAR(speedLimiterStep) * floor (GVAR(speedLimit) / GVAR(speedLimiterStep));
-        };
+        GVAR(speedLimit) = 5 max GVAR(speedLimiterStep) * floor (GVAR(speedLimit) / GVAR(speedLimiterStep));
         [["%1: %2", LSTRING(SpeedLimit), GVAR(speedLimit)]] call EFUNC(common,displayTextStructured);
         true
     };
@@ -50,9 +48,7 @@ GVAR(isSpeedLimiter) = false;
 ["ACE3 Vehicles", QGVAR(scrollDown), localize LSTRING(DecreaseSpeedLimit), {
     if (GVAR(isSpeedLimiter)) then {
         GVAR(speedLimit) = round (GVAR(speedLimit) - GVAR(speedLimiterStep)) max (5 max GVAR(speedLimiterStep));
-        if (GVAR(speedLimiterStep) == 5) then { // round to nearest multiple of 5
-            GVAR(speedLimit) = 5 max GVAR(speedLimiterStep) * ceil (GVAR(speedLimit) / GVAR(speedLimiterStep));
-        };
+        GVAR(speedLimit) = 5 max GVAR(speedLimiterStep) * ceil (GVAR(speedLimit) / GVAR(speedLimiterStep));
         [["%1: %2", LSTRING(SpeedLimit), GVAR(speedLimit)]] call EFUNC(common,displayTextStructured);
         true
     };
diff --git a/addons/vehicles/initSettings.sqf b/addons/vehicles/initSettings.sqf
index 500cd8d852e..eb15ea346fd 100644
--- a/addons/vehicles/initSettings.sqf
+++ b/addons/vehicles/initSettings.sqf
@@ -25,5 +25,5 @@
     "SLIDER",
     LSTRING(SpeedLimiterStep),
     ELSTRING(common,ACEKeybindCategoryVehicles),
-    [1, 10, 5, 0]
+    [1, 10, 5, -1] // whole numbers only
 ] call CBA_fnc_addSetting;