Merge pull request #1928 from acemod/headbugfix

Headbugfix

addons/common/CfgVehicles.hpp

@@ -116,4 +116,28 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_banana,1);
         };
     };
+
+    class Land_HelipadEmpty_F;
+    class ACE_LogicDummy: Land_HelipadEmpty_F {
+        scope = 1;
+        SLX_XEH_DISABLED = 1;
+        author = CSTRING(ACETeam);
+        class EventHandlers {
+            init = "(_this select 0) enableSimulation false";
+        };
+    };
+
+    class Bicycle;
+    class ACE_Headbug_Fix: Bicycle {
+        scope = 1;
+        side = 3;
+        model = PATHTOF(data\ACE_HeadBanger.p3d);
+        //model = QPATHTO_M(ACE_HeadBanger.p3d);
+        author = CSTRING(ACETeam);
+        displayName = " ";
+        soundEngine[] = {"", 20, 0.875};
+        soundEnviron[] = {"", 25, 0.925};
+        isBicycle = 1;
+        XEH_DISABLED;
+    };
 };

addons/common/XEH_preInit.sqf

@@ -106,6 +106,7 @@ PREP(goKneeling);
 PREP(hadamardProduct);
 PREP(hasItem);
 PREP(hasMagazine);
+PREP(headBugFix);
 PREP(hideUnit);
 PREP(inheritsFrom);
 PREP(insertionSort);

addons/common/functions/fnc_headBugFix.sqf

@@ -0,0 +1,25 @@
+/**
+ * fnc_headbugfix.sqf
+ * @Descr: Fixes animation issues that may get you stuck
+ * @Author: rocko
+ *
+ * @Arguments:
+ * @Return: nil
+ * @PublicAPI: true
+ */
+
+#include "script_component.hpp"
+if (player != vehicle player) exitWith {};
+titleCut ["", "BLACK"];
+_pos = getposATL player;
+// create invisible headbug fix vehicle
+_ACE_HeadbugFix = createVehicle ["ACE_Headbug_Fix", getposATL player, [], 0, "NONE"];
+player moveinDriver _ACE_HeadbugFix;
+sleep 1.0;
+unassignVehicle player;
+player action ["Eject", vehicle player];
+sleep 1.0;
+deleteVehicle _ACE_HeadbugFix;
+player setposATL _pos;
+titleCut ["", "PLAIN"];
+

addons/optionsmenu/gui/settingsMenu.hpp

@@ -247,14 +247,22 @@ class ACE_settingsMenu {
             text = CSTRING(OpenExport);
             x = X_PART(18);
             action = QUOTE(if (GVAR(serverConfigGeneration) > 0) then {createDialog 'ACE_serverSettingsMenu'; });
-        };       
+        };
         class action_debug: actionClose {
             idc = 1102;
             text = CSTRING(DumpDebug);
-            x = X_PART(26.5);
+            x = X_PART(26.1);
             action = QUOTE([] call FUNC(debugDumpToClipboard));
             tooltip = CSTRING(DumpDebugTooltip);
         };
+        class action_headBugFix: actionClose {
+            idc = 1102;
+            text = CSTRING(headBugFix);
+            x = X_PART(34);
+            w = W_PART(5);
+            action = QUOTE(0 spawn EFUNC(common,headBugFix); closedialog 0;);
+            tooltip = CSTRING(headBugFixTooltip);
+        };
     };
 };
 class ACE_serverSettingsMenu: ACE_settingsMenu {

addons/optionsmenu/stringtable.xml

@@ -344,6 +344,12 @@
             <Czech>Pošle debug informace do RPT a schránky.</Czech>
             <German>Protokolliert Debug-Informationen im RPT und speichert sie in der Zwischenablage.</German>
             <Portuguese>Envia informação de depuração para RPT e área de transferência.</Portuguese>
+        </Key>
+		<Key ID="STR_ACE_OptionsMenu_headBugFix">
+            <English>Headbug Fix</English>
+        </Key>
+		<Key ID="STR_ACE_OptionsMenu_headBugFixTooltip">
+            <English>Resets your animation state.</English>
         </Key>
         <Key ID="STR_ACE_OptionsMenu_aceNews">
             <English>ACE News</English>