Skip to content

Commit 7fb18f4

Browse files
authored
Merge pull request #1668 from johnb432/disposable-add-errors
Disposable - Throw errors for invalid config entries for disposable launchers
2 parents cb74759 + 728336d commit 7fb18f4

File tree

1 file changed

+21
-1
lines changed

1 file changed

+21
-1
lines changed

addons/disposable/XEH_preInit.sqf

+21-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,27 @@ private _cfgMagazines = configFile >> "CfgMagazines";
3838
{
3939
private _launcher = configName _x;
4040
private _magazine = configName (_cfgMagazines >> (getArray (_cfgWeapons >> _launcher >> "magazines") select 0));
41-
getArray _x params ["_loadedLauncher", "_usedLauncher"];
41+
42+
if (_magazine == "") then {
43+
ERROR_1("Launcher %1 has an undefined magazine.",_launcher);
44+
45+
continue;
46+
};
47+
48+
(getArray _x) params [["_loadedLauncher", "", [""]], ["_usedLauncher", "", [""]]];
49+
50+
if (_loadedLauncher == "") then {
51+
ERROR_1("Launcher %1 has an undefined loaded launcher.",_launcher);
52+
53+
continue;
54+
};
55+
56+
if (_usedLauncher == "") then {
57+
ERROR_1("Launcher %1 has an undefined used launcher.",_launcher);
58+
59+
continue;
60+
};
61+
4262
private _fitsInBackpacks = TYPE_BACKPACK in getArray (configFile >> "CfgWeapons" >> _loadedLauncher >> "WeaponSlotsInfo" >> "allowedSlots");
4363

4464
GVAR(LoadedLaunchers) setVariable [_launcher, _loadedLauncher];

0 commit comments

Comments
 (0)