diff --git a/framework/init/functions/fn_initClient.sqf b/framework/init/functions/fn_initClient.sqf index 39fc06e..e45f73e 100644 --- a/framework/init/functions/fn_initClient.sqf +++ b/framework/init/functions/fn_initClient.sqf @@ -24,7 +24,6 @@ EGVAR(common,diaryRecords) = createHashMap; // initialize other modules call EFUNC(mapcopy,initClient); -call EFUNC(rasptools,initClient); call EFUNC(reinsert,initClient); call EFUNC(resupply,initClient); call EFUNC(triageIcons,initClient); diff --git a/framework/resupply/functions/fn_addArsenalObjectSpawnBoxActions.sqf b/framework/resupply/functions/fn_addArsenalObjectSpawnBoxActions.sqf index 247377c..b1f8f65 100644 --- a/framework/resupply/functions/fn_addArsenalObjectSpawnBoxActions.sqf +++ b/framework/resupply/functions/fn_addArsenalObjectSpawnBoxActions.sqf @@ -44,13 +44,16 @@ private _supplyCrateTypesCfgs = _supplyCratesCfg call BIS_fnc_returnChildren; configName _supplyCrateCfg, getPos _target ] call FUNC(createBox); + // log action use in server RPT + private _supplyCrateDisplayName = (_supplyCrateCfg >> "displayName") call BIS_fnc_getCfgData; [ LEVEL_INFO, QUOTE(COMPONENT), "Supply crate spawned", [player, [ - ["supplyCrateType", _supplyCrateDisplayName], + ["supplyCrateDisplayName", _supplyCrateDisplayName], + ["supplyCrateCfgName", configName _supplyCrateCfg], ["position", getPos _target] ]] call EFUNC(common,addPlayerInfoToArray) ] remoteExec [QEFUNC(common,log), 2]; diff --git a/framework/vehicleFlags/functions/fn_initClient.sqf b/framework/vehicleFlags/functions/fn_initClient.sqf index dd2dbcc..b0d9537 100644 --- a/framework/vehicleFlags/functions/fn_initClient.sqf +++ b/framework/vehicleFlags/functions/fn_initClient.sqf @@ -1,7 +1,7 @@ -if (!hasInterface) exitWith {}; - #include "..\script_component.hpp" +if (!hasInterface) exitWith {}; + private _vehicleFlagsCfg = call FUNC(getVehicleFlagsCfg); if (!isClass _vehicleFlagsCfg) exitWith { diff --git a/framework/vehicleFlags/functions/fn_isClassExcluded.sqf b/framework/vehicleFlags/functions/fn_isClassExcluded.sqf index 223d6ae..8c3977e 100644 --- a/framework/vehicleFlags/functions/fn_isClassExcluded.sqf +++ b/framework/vehicleFlags/functions/fn_isClassExcluded.sqf @@ -6,21 +6,30 @@ Parameter(s): 0: STRING - Classname of the vehicle to check */ - +#include "..\script_component.hpp" if (!hasInterface) exitWith {}; params [["_className", "", [""]]]; if (_className == "") exitWith {false}; -private _vehicleFlagsCfg = call milsim_vehicleFlags_fnc_getVehicleFlagsCfg; +private _vehicleFlagsCfg = call FUNC(getVehicleFlagsCfg); private _excludedVehiclesClass = (_vehicleFlagsCfg >> "ExcludedVehicles"); private _exclusionGroups = configProperties [_vehicleFlagsCfg >> "ExcludedVehicles"]; +private _isExcluded = false; { - // Check if the class doesn't have a flag proxy + // Check if the class is directly excluded private _excludedClasses = _x call BIS_fnc_getCfgDataArray; - if (_className in _excludedClasses) exitWith {true}; + if (_className in _excludedClasses) exitWith { + _isExcluded = true; + }; + { + if (_className isKindOf _x) exitWith { + _isExcluded = true; + }; + } forEach _excludedClasses; + if (_isExcluded) exitWith {}; } forEach _exclusionGroups; -false; +_isExcluded;