Merge branch 'ballistics-mags-cleanup' of https://github.com/Salluci/ACE3 into ballistics-mags-cleanup

addons/common/functions/fnc_headBugFix.sqf

@@ -25,6 +25,8 @@ private _anim = animationState _unit;
 
 if (_unit != vehicle _unit  || {!([_unit, objNull, ["isNotSitting"]] call FUNC(canInteractWith))}) exitWith {false};
 
+["ace_headBugFix", true] call FUNC(setDisableUserInputStatus);
+
 private _pos = getPosATL _unit;
 private _dir = getDir _unit;
 
@@ -47,4 +49,7 @@ deleteVehicle _dummy;
 
 [_unit, "headBugFix"] call FUNC(unhideUnit);
 titleCut ["", "PLAIN"];
+
+["ace_headBugFix", false] call FUNC(setDisableUserInputStatus);
+
 true

addons/overheating/CfgWeapons.hpp

@@ -10,16 +10,16 @@ class CfgWeapons {
         //Slowdown Factor (this will be scaled based on the barrel temp)
         GVAR(slowdownFactor) = 1;
     };
-    class Rifle_Base_F : Rifle {};
-    class Rifle_Long_Base_F : Rifle_Base_F {
+    class Rifle_Base_F;
+    class Rifle_Long_Base_F: Rifle_Base_F {
         GVAR(dispersion) = 0.75;
     };
 
-    class arifle_MX_Base_F : Rifle_Base_F {
+    class arifle_MX_Base_F: Rifle_Base_F {
         // Custom jam clearing action. Default uses reload animation.
         ACE_clearJamAction = "GestureReloadMX";
     };
-    class arifle_MX_SW_F : arifle_MX_Base_F {
+    class arifle_MX_SW_F: arifle_MX_Base_F {
         // Custom jam clearing action. Use empty string to undefine.
         ACE_clearJamAction = "";
         // 1 to enable barrel swap. 0 to disable. Meant for machine guns where you can easily swap the barrel without dismantling the whole weapon.
@@ -32,10 +32,13 @@ class CfgWeapons {
     class MMG_02_base_F: Rifle_Long_Base_F {
         GVAR(allowSwapBarrel) = 1;
     };
-    class LMG_Zafir_F : Rifle_Long_Base_F {
+    class LMG_Zafir_F: Rifle_Long_Base_F {
         GVAR(allowSwapBarrel) = 1;
     };
-    class LMG_Mk200_F : Rifle_Long_Base_F {
+    class LMG_Mk200_F: Rifle_Long_Base_F {
+        GVAR(allowSwapBarrel) = 1;
+    };
+    class LMG_03_Base_F: Rifle_Long_Base_F {
         GVAR(allowSwapBarrel) = 1;
     };
     class ACE_ItemCore;

addons/reloadlaunchers/CfgWeapons.hpp

@@ -4,8 +4,13 @@ class CfgWeapons {
     class launch_Titan_base: Launcher_Base_F {
         GVAR(enabled) = 1;
     };
-
     class launch_RPG32_F: Launcher_Base_F {
         GVAR(enabled) = 1;
     };
+    class launch_MRAWS_base_F: Launcher_Base_F {
+        GVAR(enabled) = 1;
+    };
+    class launch_Vorona_base_F: Launcher_Base {
+        GVAR(enabled) = 1;
+    };
 };