Merge branch 'fire/customize-screams' of https://github.com/DartRuffian/ACE3 into pr/10890

Author: johnb432

addons/fire/XEH_preInit.sqf

@@ -8,22 +8,6 @@ PREP_RECOMPILE_END;
 
 #include "initSettings.inc.sqf"
 
-GVAR(screams) = createHashMapFromArray [["CAManBase", [
-    QGVAR(scream_1),
-    QGVAR(scream_2),
-    QGVAR(scream_3),
-    QGVAR(scream_4),
-    QGVAR(scream_5),
-    QGVAR(scream_6),
-    QGVAR(scream_7),
-    QGVAR(scream_8),
-    QGVAR(scream_9),
-    QGVAR(scream_10),
-    QGVAR(scream_11),
-    QGVAR(scream_12),
-    QGVAR(scream_13),
-    QGVAR(scream_14),
-    QGVAR(scream_15)
-]]];
+GVAR(screams) = createHashMap;
 
 ADDON = true;

addons/fire/functions/fnc_getScreams.sqf

@@ -26,11 +26,11 @@ if (_unitClass == "" || !(_unitClass isKindOf "CAManBase")) exitWith { [] };
 // If unit is defined in hash, grab sounds and return
 // If not, check each parent of the class until a value is defined
 GVAR(screams) getOrDefaultCall [_unitClass, {
-    private _type = _unitClass;
-    private _return = [];
-    while {true} do {
-        _type = configName inheritsFrom (configFile >> "CfgVehicles" >> _type);
-        if (_type in GVAR(screams)) exitWith { _return = GVAR(screams) get _type };
+    private _cfg = configFile >> "CfgVehicles" >> _unitClass;
+    private _return = getArray (_cfg >> QGVAR(screams));
+    while {!isNull _cfg} do {
+        _cfg = inheritsFrom _cfg;
+        if ((configName _cfg) in GVAR(screams)) exitWith { _return = GVAR(screams) get (configName _cfg) };
     };
     _return // return
 }];