From c24c1b9dc0d427469350d0c917fd48ad96b9b188 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Tue, 29 Mar 2016 15:39:32 +0200
Subject: [PATCH] Fix inverted Stop and Freeze - prone Stop will still be
 freeze due to BI animation being wrong

---
 addons/gestures/CfgVehicles.hpp               |  12 ++++----
 .../anim/{ace_stop.rtm => ace_freeze.rtm}     | Bin
 ...wered.rtm => ace_freeze_stand_lowered.rtm} | Bin
 addons/gestures/cfgMovesBasic.hpp             |  16 +++++------
 addons/gestures/key.sqf                       |   2 +-
 addons/gestures/stringtable.xml               |  26 +++++++++---------
 6 files changed, 28 insertions(+), 28 deletions(-)
 rename addons/gestures/anim/{ace_stop.rtm => ace_freeze.rtm} (100%)
 rename addons/gestures/anim/{ace_stop_stand_lowered.rtm => ace_freeze_stand_lowered.rtm} (100%)

diff --git a/addons/gestures/CfgVehicles.hpp b/addons/gestures/CfgVehicles.hpp
index d3c7b5ca21..17dbfc0846 100644
--- a/addons/gestures/CfgVehicles.hpp
+++ b/addons/gestures/CfgVehicles.hpp
@@ -46,10 +46,10 @@ class CfgVehicles {
                     showDisabled = 1;
                     priority = 1.3;
                 };
-                class GVAR(Freeze) {
-                    displayName = CSTRING(BIgestureFreeze);
+                class GVAR(Stop) {
+                    displayName = CSTRING(stop);
                     condition = QUOTE(canStand _target);
-                    statement = QUOTE(_target playActionNow 'gestureFreeze';);
+                    statement = QUOTE(_target playActionNow 'gestureFreeze';); // BI animation - is actualls "stop" in all stances but prone
                     showDisabled = 1;
                     priority = 1.2;
                 };
@@ -67,10 +67,10 @@ class CfgVehicles {
                     showDisabled = 1;
                     priority = 1.8;
                 };
-                class GVAR(Stop) {
-                    displayName = CSTRING(stop);
+                class GVAR(Freeze) {
+                    displayName = CSTRING(freeze);
                     condition = QUOTE(canStand _target && GVAR(ReloadMutex));
-                    statement = QUOTE(QUOTE(QGVAR(stop)) call FUNC(playSignal));
+                    statement = QUOTE(QUOTE(QGVAR(freeze)) call FUNC(playSignal));
                     showDisabled = 1;
                     priority = 1.7;
                 };
diff --git a/addons/gestures/anim/ace_stop.rtm b/addons/gestures/anim/ace_freeze.rtm
similarity index 100%
rename from addons/gestures/anim/ace_stop.rtm
rename to addons/gestures/anim/ace_freeze.rtm
diff --git a/addons/gestures/anim/ace_stop_stand_lowered.rtm b/addons/gestures/anim/ace_freeze_stand_lowered.rtm
similarity index 100%
rename from addons/gestures/anim/ace_stop_stand_lowered.rtm
rename to addons/gestures/anim/ace_freeze_stand_lowered.rtm
diff --git a/addons/gestures/cfgMovesBasic.hpp b/addons/gestures/cfgMovesBasic.hpp
index a708787fd5..50a835abe6 100644
--- a/addons/gestures/cfgMovesBasic.hpp
+++ b/addons/gestures/cfgMovesBasic.hpp
@@ -1,7 +1,7 @@
 class CfgMovesBasic {
     class ManActions {
         GVAR(forward) = QGVAR(forward);
-        GVAR(stop) = QGVAR(stop);
+        GVAR(freeze) = QGVAR(freeze);
         GVAR(cover) = QGVAR(cover);
         GVAR(regroup) = QGVAR(regroup);
         GVAR(engage) = QGVAR(engage);
@@ -10,7 +10,7 @@ class CfgMovesBasic {
         GVAR(warning) = QGVAR(warningS);
 
         GVAR(forwardStandLowered) = QGVAR(forwardStandLowered);
-        GVAR(stopStandLowered) = QGVAR(stopStandLowered);
+        GVAR(freezeStandLowered) = QGVAR(freezeStandLowered);
         GVAR(coverStandLowered) = QGVAR(coverStandLowered);
         GVAR(regroupStandLowered) = QGVAR(regroupStandLowered);
         GVAR(engageStandLowered) = QGVAR(engageStandLowered);
@@ -22,7 +22,7 @@ class CfgMovesBasic {
     class Actions {
         class NoActions: ManActions {
             GVAR(forward)[] = {QGVAR(forward), "Gesture"};
-            GVAR(stop)[] = {QGVAR(stop), "Gesture"};
+            GVAR(freeze)[] = {QGVAR(freeze), "Gesture"};
             GVAR(cover)[] = {QGVAR(cover), "Gesture"};
             GVAR(regroup)[] = {QGVAR(regroup), "Gesture"};
             GVAR(engage)[] = {QGVAR(engage), "Gesture"};
@@ -31,7 +31,7 @@ class CfgMovesBasic {
             GVAR(warning)[] = {QGVAR(warning), "Gesture"};
 
             GVAR(forwardStandLowered)[] = {QGVAR(forwardStandLowered), "Gesture"};
-            GVAR(stopStandLowered)[] = {QGVAR(stopStandLowered), "Gesture"};
+            GVAR(freezeStandLowered)[] = {QGVAR(freezeStandLowered), "Gesture"};
             GVAR(coverStandLowered)[] = {QGVAR(coverStandLowered), "Gesture"};
             GVAR(regroupStandLowered)[] = {QGVAR(regroupStandLowered), "Gesture"};
             GVAR(engageStandLowered)[] = {QGVAR(engageStandLowered), "Gesture"};
@@ -134,13 +134,13 @@ class CfgGesturesMale {
             file = QUOTE(PATHTOF(anim\ace_forward_stand_lowered.rtm));
         };
 
-        class GVAR(stop): GVAR(forward) {
-            file = QUOTE(PATHTOF(anim\ace_stop.rtm));
+        class GVAR(freeze): GVAR(forward) {
+            file = QUOTE(PATHTOF(anim\ace_freeze.rtm));
             speed = 0.6;
         };
 
-        class GVAR(stopStandLowered): GVAR(stop) {
-            file = QUOTE(PATHTOF(anim\ace_stop_stand_lowered.rtm));
+        class GVAR(freezeStandLowered): GVAR(freeze) {
+            file = QUOTE(PATHTOF(anim\ace_freeze_stand_lowered.rtm));
         };
 
         class GVAR(cover): GVAR(forward) {
diff --git a/addons/gestures/key.sqf b/addons/gestures/key.sqf
index 54d6d50c0c..589f116f5b 100644
--- a/addons/gestures/key.sqf
+++ b/addons/gestures/key.sqf
@@ -25,7 +25,7 @@
 
     false
 } count [
-    ["stop", DIK_NUMPAD2],
+    ["freeze", DIK_NUMPAD2],
     ["cover", DIK_NUMPAD3],
     ["forward", DIK_NUMPAD4],
     ["regroup", DIK_NUMPAD5],
diff --git a/addons/gestures/stringtable.xml b/addons/gestures/stringtable.xml
index 1f008ddae9..7ad0e4eaa6 100644
--- a/addons/gestures/stringtable.xml
+++ b/addons/gestures/stringtable.xml
@@ -97,19 +97,6 @@
             <Portuguese>Apontar</Portuguese>
             <Italian>Puntare a</Italian>
         </Key>
-        <Key ID="STR_ACE_Gestures_BIgestureFreeze">
-            <English>Freeze</English>
-            <German>Keine Bewegung</German>
-            <Spanish>Alto</Spanish>
-            <Polish>Stać</Polish>
-            <Czech>Stát</Czech>
-            <French>Halte</French>
-            <Russian>Замереть</Russian>
-            <Hungarian>Állj</Hungarian>
-            <Portuguese>Alto</Portuguese>
-            <Italian>Fermi</Italian>
-        </Key>
-        <!-- STOP -->
         <Key ID="STR_ACE_Gestures_stop">
             <English>Stop</English>
             <French>Stop</French>
@@ -121,6 +108,19 @@
             <Italian>Stop</Italian>
             <Spanish>Detenerse</Spanish>
         </Key>
+        <!-- STOP -->
+        <Key ID="STR_ACE_Gestures_freeze">
+            <English>Freeze</English>
+            <German>Keine Bewegung</German>
+            <Spanish>Alto</Spanish>
+            <Polish>Stać</Polish>
+            <Czech>Stát</Czech>
+            <French>Halte</French>
+            <Russian>Замереть</Russian>
+            <Hungarian>Állj</Hungarian>
+            <Portuguese>Alto</Portuguese>
+            <Italian>Fermi</Italian>
+        </Key>
         <!-- COVER -->
         <Key ID="STR_ACE_Gestures_cover">
             <English>Cover</English>