Grenades - Code cleanup

addons/common/functions/fnc_addToInventory.sqf

@@ -59,6 +59,18 @@ switch (_container) do {
     };
 };
 
+if (_type select 0 == "magazine") then {
+    if (_ammoCount == -1) then {
+        _ammoCount = getNumber (configFile >> "CfgMagazines" >> _classname >> "count");
+    };
+
+    // https://feedback.bistudio.com/T74244
+    // When adding throwables with the addXXXCargo(Global) commands, they don't show up in the throwables list
+    if (_ammoCount == 1 && {_classname call BIS_fnc_isThrowable}) then {
+        _type set [0, "item"];
+    };
+};
+
 switch (_type select 0) do {
     case "weapon": {
         if (_canAdd || {_canFitWeaponSlot}) then {
@@ -106,10 +118,6 @@ switch (_type select 0) do {
     };
 
     case "magazine": {
-        if (_ammoCount == -1) then {
-            _ammoCount = getNumber (configFile >> "CfgMagazines" >> _classname >> "count");
-        };
-
         if (_canAdd) then {
             _addedToUnit = true;
 

addons/grenades/CfgEventHandlers.hpp

@@ -1,4 +1,3 @@
-
 class Extended_PreStart_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));

addons/grenades/XEH_PREP.hpp

@@ -1,4 +1,3 @@
-
 PREP(flare);
 PREP(flashbangExplosionEH);
 PREP(flashbangThrownFuze);

addons/grenades/XEH_postInit.sqf

@@ -1,6 +1,7 @@
 // by commy2
 
 #include "script_component.hpp"
+#include "\a3\ui_f\hpp\defineDIKCodes.inc"
 
 ["ace_flashbangExploded", LINKFUNC(flashbangExplosionEH)] call CBA_fnc_addEventHandler;
 
@@ -15,7 +16,7 @@ GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265];
 GVAR(flashbangPPEffectCC) ppEffectForceInNVG true;
 
 // Add keybinds
-["ACE3 Weapons", QGVAR(switchGrenadeMode), localize LSTRING(SwitchGrenadeMode), {
+["ACE3 Weapons", QGVAR(switchGrenadeMode), LLSTRING(SwitchGrenadeMode), {
     // Conditions: canInteract
     if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
@@ -24,11 +25,11 @@ GVAR(flashbangPPEffectCC) ppEffectForceInNVG true;
     if (ACE_player getVariable [QEGVAR(advanced_throwing,inHand), false]) exitWith {false};
 
     // Statement
-    [] call FUNC(nextMode);
-}, {false}, [9, [false, false, false]], false] call CBA_fnc_addKeybind; //8 Key
+    call FUNC(nextMode) // return
+}, {}, [DIK_8, [false, false, false]], false] call CBA_fnc_addKeybind; // 8 Key
 
 ["CBA_settingsInitialized", {
     if (GVAR(convertExplosives)) then {
-        [] call FUNC(addChangeFuseItemContextMenuOptions);
+        call FUNC(addChangeFuseItemContextMenuOptions);
     };
 }] call CBA_fnc_addEventHandler;

addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf

@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: Cyruz
- * Allows conversion of explosive charges in to throwable versions
+ * Allows conversion of explosive charges into throwable versions.
  *
  * Arguments:
  * None
@@ -14,7 +14,8 @@
  *
  * Public: No
  */
- TRACE_1("addChangeFuseItemContextMenuOptions",_this);
+
+LOG("addChangeFuseItemContextMenuOptions");
 
 {
     _x params ["_mag", "_throwableMag"];
@@ -29,21 +30,25 @@
             {true},
             {
                 params ["", "", "_item", "", "_magArr"];
-                _item isEqualTo (_magArr select 0);
+
+                _item == (_magArr select 0)
             }
         ],
         {
             params ["_unit", "", "", "_slot", "_magArr"];
-            private _container = "";
-            switch _slot do {
+
+            private _container = switch (_slot) do {
                 case "UNIFORM_CONTAINER": {
-                    _container = "uniform";
+                    "uniform"
                 };
                 case "VEST_CONTAINER": {
-                    _container = "vest";
+                    "vest"
                 };
                 case "BACKPACK_CONTAINER": {
-                    _container = "backpack";
+                    "backpack"
+                };
+                default {
+                    ""
                 };
             };
 
@@ -54,7 +59,7 @@
             false
         },
         true,
-        [_mag,_throwableMag]
+        [_mag, _throwableMag]
     ] call CBA_fnc_addItemContextMenuOption;
 
     [
@@ -67,21 +72,25 @@
             {true},
             {
                 params ["", "", "_item", "", "_magArr"];
-                _item isEqualTo (_magArr select 1);
+
+                _item == (_magArr select 1)
             }
         ],
         {
             params ["_unit", "", "", "_slot", "_magArr"];
-            private _container = "";
-            switch _slot do {
+
+            private _container = switch (_slot) do {
                 case "UNIFORM_CONTAINER": {
-                    _container = "uniform";
+                    "uniform"
                 };
                 case "VEST_CONTAINER": {
-                    _container = "vest";
+                    "vest"
                 };
                 case "BACKPACK_CONTAINER": {
-                    _container = "backpack";
+                    "backpack"
+                };
+                default {
+                    ""
                 };
             };
 
@@ -92,7 +101,7 @@
             false
         },
         true,
-        [_mag,_throwableMag]
+        [_mag, _throwableMag]
     ] call CBA_fnc_addItemContextMenuOption;
 } forEach [
     ["SatchelCharge_Remote_Mag", "ACE_SatchelCharge_Remote_Mag_Throwable"],