Merge pull request #2102 from acemod/disposableFixes

Disposable fixes

addons/disposable/CfgEventHandlers.hpp

@@ -22,7 +22,7 @@ class Extended_FiredBIS_EventHandlers {
 class Extended_InitPost_EventHandlers {
     class CAManBase {
         class ADDON {
-            init = QUOTE([ARR_2(_this select 0, secondaryWeapon (_this select 0))] call FUNC(takeLoadedATWeapon));
+            init = QUOTE([_this select 0] call FUNC(takeLoadedATWeapon));
         };
     };
 };

addons/disposable/CfgMagazines.hpp

@@ -1,6 +1,6 @@
 class CfgMagazines {
     class NLAW_F;
-    class ACE_PreloadedMissileDummy: NLAW_F {              // The dummy magazine
+    class ACE_PreloadedMissileDummy: NLAW_F {  // The dummy magazine
         author = ECSTRING(common,ACETeam);
         scope = 1;
         scopeArsenal = 1;
@@ -12,14 +12,4 @@ class CfgMagazines {
     class ACE_FiredMissileDummy: ACE_PreloadedMissileDummy {
         count = 0;
     };
-    class ACE_UsedTube_F: NLAW_F {
-        author = ECSTRING(common,ACETeam);
-        displayName = CSTRING(UsedTube);
-        descriptionShort = CSTRING(UsedTubeDescription);
-        displayNameShort = "-";
-        count = 0;
-        weaponPoolAvailable = 0;
-        modelSpecial = "";
-        mass = 0;
-    };
 };

addons/disposable/XEH_postInit.sqf

@@ -3,9 +3,12 @@
 
 if (!hasInterface) exitWith {};
 
-["inventoryDisplayLoaded", {[ACE_player, _this select 0] call FUNC(updateInventoryDisplay)}] call EFUNC(common,addEventHandler);
+["inventoryDisplayLoaded", {
+    [ACE_player, _this select 0] call FUNC(updateInventoryDisplay)
+}] call EFUNC(common,addEventHandler);
+
 ["playerInventoryChanged", {
-    params ["_unit", "_items"];
+    params ["_unit"];
-    [_unit, _items select 11] call FUNC(takeLoadedATWeapon);
+    [_unit] call FUNC(takeLoadedATWeapon);
     [_unit] call FUNC(updateInventoryDisplay);
 }] call EFUNC(common,addEventHandler);

addons/disposable/XEH_postInitClient.sqf

@@ -1,10 +0,0 @@
-// by commy2
-
-// The Arma InventoryOpened EH fires actually before the inventory dialog is opened (findDisplay 602 => displayNull).
-
-#include "script_component.hpp"
-
-["inventoryDisplayLoaded",{
-    [ACE_player] call FUNC(takeLoadedATWeapon);
-    [ACE_player, (_this select 0)] call FUNC(updateInventoryDisplay);
-}] call EFUNC(common,addEventHandler);

addons/disposable/functions/fnc_replaceATWeapon.sqf

@@ -21,14 +21,14 @@
  */
 #include "script_component.hpp"
 
-private ["_replacementTube", "_items"];
 params ["_unit", "_weapon", "", "", "", "", "_projectile"];
+TRACE_3("params",_unit,_weapon,_projectile);
 
-if (!local _unit) exitWith {};
+if ((!local _unit) || {_weapon != (secondaryWeapon _unit)})  exitWith {};
 
+private ["_replacementTube", "_items"];
 _replacementTube = getText (configFile >> "CfgWeapons" >> _weapon >> "ACE_UsedTube");
 if (_replacementTube == "") exitWith {}; //If no replacement defined just exit
-if (_weapon != (secondaryWeapon _unit)) exitWith {}; //just to be sure
 
 
 //Save array of items attached to launcher

addons/disposable/functions/fnc_takeLoadedATWeapon.sqf

@@ -15,17 +15,18 @@
  */
 #include "script_component.hpp"
 
-private ["_unit", "_launcher", "_config"];
-
 params ["_unit"];
+TRACE_1("params",_unit);
 
 if (!local _unit) exitWith {};
 
+private ["_launcher", "_config"];
+
 _launcher = secondaryWeapon _unit;
 _config = configFile >> "CfgWeapons" >> _launcher;
 
 if (isClass _config && {getText (_config >> "ACE_UsedTube") != ""} && {getNumber (_config >> "ACE_isUsedLauncher") != 1} && {count secondaryWeaponMagazine _unit == 0}) then {
-    private ["_magazine", "_isLauncherSelected"];
+    private ["_magazine", "_isLauncherSelected", "_didAdd"];
 
     _magazine = getArray (_config >> "magazines") select 0;
 
@@ -35,14 +36,22 @@ if (isClass _config && {getText (_config >> "ACE_UsedTube") != ""} && {getNumber
 
     if (backpack _unit == "") then {
         _unit addBackpack "Bag_Base";
-
         _unit addMagazine _magazine;
+        _didAdd = _magazine in (magazines _unit);
         _unit addWeapon _launcher;
-
+        if (!_didAdd) then {
+            TRACE_1("Failed To Add Disposable Magazine Normally, doing backup method (no backpack)",_unit);
+            _unit addSecondaryWeaponItem _magazine;
+        };
         removeBackpack _unit;
     } else {
         _unit addMagazine _magazine;
+        _didAdd = _magazine in (magazines _unit);
         _unit addWeapon _launcher;
+        if (!_didAdd) then {
+            TRACE_2("Failed To Add Disposable Magazine Normally, doing backup method",_unit,(backpack _unit));
+            _unit addSecondaryWeaponItem _magazine;
+        };
     };
 
     if (_isLauncherSelected) then {

addons/disposable/functions/fnc_updateInventoryDisplay.sqf

@@ -17,6 +17,7 @@
 
 disableSerialization;
 params ["_player", ["_display",(findDisplay 602),[displayNull]]];
+TRACE_2("params",_player,_display);
 
 _player removeMagazines "ACE_PreloadedMissileDummy";
 _player removeMagazines "ACE_FiredMissileDummy";

addons/disposable/script_component.hpp

@@ -1,6 +1,8 @@
 #define COMPONENT disposable
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+
 #ifdef DEBUG_ENABLED_ATTACH
     #define DEBUG_MODE_FULL
 #endif