From 858c68f8d702a0dd1db50220f3f2c552a4c2e0a5 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Sun, 6 Mar 2016 16:54:27 +0100
Subject: [PATCH] Don't use modifier for rotation where not needed

---
 .../functions/fnc_handleScrollWheel.sqf       |  2 +-
 addons/explosives/stringtable.xml             | 20 ++++++++---------
 .../functions/fnc_handleScrollWheel.sqf       |  4 ++--
 addons/sandbag/stringtable.xml                | 22 +++++++++----------
 .../functions/fnc_handleScrollWheel.sqf       |  2 +-
 .../functions/fnc_handleScrollWheel.sqf       |  4 ++--
 addons/trenches/stringtable.xml               | 16 +++++++++-----
 7 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/addons/explosives/functions/fnc_handleScrollWheel.sqf b/addons/explosives/functions/fnc_handleScrollWheel.sqf
index 0d5fdd2aba..36530afb08 100644
--- a/addons/explosives/functions/fnc_handleScrollWheel.sqf
+++ b/addons/explosives/functions/fnc_handleScrollWheel.sqf
@@ -15,7 +15,7 @@
  */
 #include "script_component.hpp"
 
-if ((!GVAR(pfeh_running)) || {ACE_Modifier == 0}) exitWith {false};
+if (!GVAR(pfeh_running)) exitWith {false};
 
 GVAR(TweakedAngle) = ((GVAR(TweakedAngle) + 7.2 * _this) + 360) % 360;
 
diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml
index ad89649cbd..e3ba902a9b 100644
--- a/addons/explosives/stringtable.xml
+++ b/addons/explosives/stringtable.xml
@@ -107,16 +107,16 @@
             <Russian>Отмена</Russian>
         </Key>
         <Key ID="STR_ACE_Explosives_ScrollAction">
-            <English>+Ctrl rotate</English>
-            <German>+Strg drehen</German>
-            <Spanish>+Ctrl girar</Spanish>
-            <French>+Ctrl tourner</French>
-            <Italian>+Ctrl rotazione</Italian>
-            <Czech>+Ctrl otočit</Czech>
-            <Hungarian>+Ctrl forgatás</Hungarian>
-            <Polish>+Ctrl obrót</Polish>
-            <Portuguese>+Ctrl rotaciona</Portuguese>
-            <Russian>+Ctrl Bращать</Russian>
+            <English>Rotate</English>
+            <German>Drehen</German>
+            <Spanish>Girar</Spanish>
+            <French>Tourner</French>
+            <Italian>Rotazione</Italian>
+            <Czech>Otočit</Czech>
+            <Hungarian>Forgatás</Hungarian>
+            <Polish>Obrót</Polish>
+            <Portuguese>Rotaciona</Portuguese>
+            <Russian>Bращать</Russian>
         </Key>
         <Key ID="STR_ACE_Explosives_Jammer_TurnOn">
             <English>Turn On Thor III</English>
diff --git a/addons/sandbag/functions/fnc_handleScrollWheel.sqf b/addons/sandbag/functions/fnc_handleScrollWheel.sqf
index 94697d7691..20d403a7a1 100644
--- a/addons/sandbag/functions/fnc_handleScrollWheel.sqf
+++ b/addons/sandbag/functions/fnc_handleScrollWheel.sqf
@@ -15,9 +15,9 @@
  */
 #include "script_component.hpp"
 
-params ["_scroll"];
+if (GVAR(deployPFH) == -1) exitWith {false};
 
-if (GETMVAR(ACE_Modifier,0) == 0 || GVAR(deployPFH) == -1) exitWith { false };
+params ["_scroll"];
 
 GVAR(deployDirection) = GVAR(deployDirection) + (_scroll * 5);
 
diff --git a/addons/sandbag/stringtable.xml b/addons/sandbag/stringtable.xml
index 70db715d77..a1d7a46938 100644
--- a/addons/sandbag/stringtable.xml
+++ b/addons/sandbag/stringtable.xml
@@ -146,16 +146,16 @@
             <Portuguese>Aqui não tem areia</Portuguese>
         </Key>
         <Key ID="STR_ACE_Sandbag_ScrollAction">
-            <English>+Ctrl rotate</English>
-            <German>+Strg drehen</German>
-            <Spanish>+Ctrl girar</Spanish>
-            <French>+Ctrl tourner</French>
-            <Italian>+Ctrl rotazione</Italian>
-            <Czech>+Ctrl otočit</Czech>
-            <Hungarian>+Ctrl forgatás</Hungarian>
-            <Polish>+Ctrl obrót</Polish>
-            <Portuguese>+Ctrl rotaciona</Portuguese>
-            <Russian>+Ctrl Bращать</Russian>
+            <English>Rotate</English>
+            <German>Drehen</German>
+            <Spanish>Girar</Spanish>
+            <French>Tourner</French>
+            <Italian>Rotazione</Italian>
+            <Czech>Otočit</Czech>
+            <Hungarian>Forgatás</Hungarian>
+            <Polish>Obrót</Polish>
+            <Portuguese>Rotaciona</Portuguese>
+            <Russian>Bращать</Russian>
         </Key>
     </Package>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/addons/tacticalladder/functions/fnc_handleScrollWheel.sqf b/addons/tacticalladder/functions/fnc_handleScrollWheel.sqf
index c22141ca24..e7d4136526 100644
--- a/addons/tacticalladder/functions/fnc_handleScrollWheel.sqf
+++ b/addons/tacticalladder/functions/fnc_handleScrollWheel.sqf
@@ -19,7 +19,7 @@ params ["_scroll"];
 
 if (isNull GVAR(ladder)) exitWith { false };
 
-if (GETMVAR(ACE_Modifier,0) == 0) then {
+if (ACE_Modifier == 0) then {
     private ["_currentStep"];
     // Lengthening
     if (_scroll > 0) then {
diff --git a/addons/trenches/functions/fnc_handleScrollWheel.sqf b/addons/trenches/functions/fnc_handleScrollWheel.sqf
index 783463dd25..5dbe661417 100644
--- a/addons/trenches/functions/fnc_handleScrollWheel.sqf
+++ b/addons/trenches/functions/fnc_handleScrollWheel.sqf
@@ -15,9 +15,9 @@
  */
 #include "script_component.hpp"
 
-params ["_scroll"];
+if (GVAR(digPFH) == -1) exitWith {false};
 
-if (GETMVAR(ACE_Modifier,0) == 0 || GVAR(digPFH) == -1) exitWith { false };
+params ["_scroll"];
 
 GVAR(digDirection) = GVAR(digDirection) + (_scroll * 5);
 
diff --git a/addons/trenches/stringtable.xml b/addons/trenches/stringtable.xml
index 4fef526858..617a604457 100644
--- a/addons/trenches/stringtable.xml
+++ b/addons/trenches/stringtable.xml
@@ -82,12 +82,16 @@
             <French>Annuler la creusée</French>
         </Key>
         <Key ID="STR_ACE_Trenches_ScrollAction">
-            <English>+Ctrl rotate</English>
-            <German>+Strg drehen</German>
-            <Polish>+Ctrl obrót</Polish>
-            <Italian>+Ctrl ruota</Italian>
-            <Spanish>+Ctrl rotar</Spanish>
-            <French>+Ctrl rotation</French>
+            <English>Rotate</English>
+            <German>Drehen</German>
+            <Spanish>Girar</Spanish>
+            <French>Tourner</French>
+            <Italian>Rotazione</Italian>
+            <Czech>Otočit</Czech>
+            <Hungarian>Forgatás</Hungarian>
+            <Polish>Obrót</Polish>
+            <Portuguese>Rotaciona</Portuguese>
+            <Russian>Bращать</Russian>
         </Key>
         <Key ID="STR_ACE_Trenches_DiggingTrench">
             <English>Digging Trench</English>