Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

General - uiNamespace cleanup (#9425)

Browse Source 
* fix clear trauma on stitch

* add compileFinal and move to hashmap

* add missin param

* fix captives

* explosives/medtreat

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
This commit is contained in:
Grim 2023-10-04 14:09:05 -04:00 committed by GitHub
parent 50fba4545f
commit f088d9bfa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/arsenal/functions/fnc_scanConfig.sqf
View File

@ -270,16 +270,16 @@ for "_index" from IDX_VIRT_OPTICS_ATTACHMENTS to IDX_VIRT_BIPOD_ATTACHMENTS do {
}; };
// This contains config case entries only // This contains config case entries only
uiNamespace setVariable [QGVAR(configItems), _configItems]; uiNamespace setVariable [QGVAR(configItems), compileFinal _configItems];
uiNamespace setVariable [QGVAR(configItemsFlat), _configItemsFlat]; uiNamespace setVariable [QGVAR(configItemsFlat), compileFinal _configItemsFlat];
uiNamespace setVariable [QGVAR(faceCache), _faceCache]; uiNamespace setVariable [QGVAR(faceCache), compileFinal _faceCache];
uiNamespace setVariable [QGVAR(voiceCache), _voiceCache]; uiNamespace setVariable [QGVAR(voiceCache), compileFinal (_voiceCache createHashMapFromArray [])];
uiNamespace setVariable [QGVAR(insigniaCache), _insigniaCache]; uiNamespace setVariable [QGVAR(insigniaCache), compileFinal (_insigniaCache createHashMapFromArray [])];
uiNamespace setVariable [QGVAR(grenadeCache), _grenadeList]; uiNamespace setVariable [QGVAR(grenadeCache), compileFinal _grenadeList];
uiNamespace setVariable [QGVAR(putCache), _putList]; uiNamespace setVariable [QGVAR(putCache), compileFinal _putList];
uiNamespace setVariable [QGVAR(magazineMiscItems), _magazineMiscItems]; uiNamespace setVariable [QGVAR(magazineMiscItems), compileFinal _magazineMiscItems];
uiNamespace setVariable [QGVAR(CBAdisposableLaunchers), _launchers]; uiNamespace setVariable [QGVAR(CBAdisposableLaunchers), compileFinal _launchers];
uiNamespace setVariable [QGVAR(configItemsTools), _toolList]; uiNamespace setVariable [QGVAR(configItemsTools), compileFinal _toolList];
// Compatibility: Override baseWeapon for RHS optics // Compatibility: Override baseWeapon for RHS optics
// No good way to do this via script for other attachments, needs manual compat // No good way to do this via script for other attachments, needs manual compat

2
addons/captives/XEH_preInit.sqf
View File

@ -8,7 +8,7 @@ PREP_RECOMPILE_END;
GVAR(captivityEnabled) = false; GVAR(captivityEnabled) = false;
GVAR(restraints) = call (uiNamespace getVariable QGVAR(restraints)); GVAR(restraints) = keys (uiNamespace getVariable QGVAR(restraints));
GVAR(blindfolds) = keys (uiNamespace getVariable QGVAR(blindfolds)); GVAR(blindfolds) = keys (uiNamespace getVariable QGVAR(blindfolds));
#include "initSettings.sqf" #include "initSettings.sqf"

2
addons/captives/XEH_preStart.sqf
View File

@ -3,7 +3,7 @@
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
private _restraints = (QUOTE(getNumber (_x >> QQGVAR(restraint)) > 0) configClasses (configFile >> "CfgWeapons") apply {configName _x}); private _restraints = (QUOTE(getNumber (_x >> QQGVAR(restraint)) > 0) configClasses (configFile >> "CfgWeapons") apply {configName _x});
uiNamespace setVariable [QGVAR(restraints), compileFinal str _restraints]; uiNamespace setVariable [QGVAR(restraints), compileFinal (_restraints createHashMapFromArray [])];
private _blindfolds = (QUOTE(getNumber (_x >> QQGVAR(blindfold)) > 0) configClasses (configFile >> "CfgGlasses") apply {configName _x}); private _blindfolds = (QUOTE(getNumber (_x >> QQGVAR(blindfold)) > 0) configClasses (configFile >> "CfgGlasses") apply {configName _x});
uiNamespace setVariable [QGVAR(blindfolds), compileFinal (_blindfolds createHashMapFromArray [])]; uiNamespace setVariable [QGVAR(blindfolds), compileFinal (_blindfolds createHashMapFromArray [])];

2
addons/explosives/XEH_preInit.sqf
View File

@ -13,6 +13,6 @@ PREP_RECOMPILE_END;
GVAR(detonationHandlers) = []; GVAR(detonationHandlers) = [];
GVAR(excludedMines) = []; GVAR(excludedMines) = [];
GVAR(defusalKits) = call (uiNamespace getVariable QGVAR(defusalKits)); GVAR(defusalKits) = keys (uiNamespace getVariable QGVAR(defusalKits));
ADDON = true; ADDON = true;

2
addons/explosives/XEH_preStart.sqf
View File

@ -3,4 +3,4 @@
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
private _defusalKits = (QUOTE(getNumber (_x >> QQGVAR(defusalKit)) > 0) configClasses (configFile >> "CfgWeapons") apply {configName _x}); private _defusalKits = (QUOTE(getNumber (_x >> QQGVAR(defusalKit)) > 0) configClasses (configFile >> "CfgWeapons") apply {configName _x});
uiNamespace setVariable [QGVAR(defusalKits), compileFinal str _defusalKits]; uiNamespace setVariable [QGVAR(defusalKits), compileFinal (_defusalKits createHashMapFromArray [])];

2
addons/field_rations/functions/fnc_scanFieldRations.sqf
View File

@ -31,4 +31,4 @@ private _fnc_isFieldRationItem = toString {
_list set [configName _x, ""]; _list set [configName _x, ""];
} forEach (_fnc_isFieldRationItem configClasses _cfgMagazines); } forEach (_fnc_isFieldRationItem configClasses _cfgMagazines);
uiNamespace setVariable [QXGVAR(fieldRationItems), compileFinal str _list]; uiNamespace setVariable [QXGVAR(fieldRationItems), compileFinal _list];

2
addons/field_rations/script_component.hpp
View File

@ -34,4 +34,4 @@
#define IDC_DRAINING_HUD_HUNGER_GROUP 7840 #define IDC_DRAINING_HUD_HUNGER_GROUP 7840
#define IDC_DRAINING_HUD_HUNGER_ICON 7850 #define IDC_DRAINING_HUD_HUNGER_ICON 7850
#define FIELD_RATIONS_ITEMS (createHashMapFromArray (call (uiNamespace getVariable [QXGVAR(fieldRationItems), {createHashMap}]))) #define FIELD_RATIONS_ITEMS (uiNamespace getVariable QXGVAR(fieldRationItems))

2
addons/medical_treatment/functions/fnc_scanMedicalItems.sqf
View File

@ -35,4 +35,4 @@ private _fnc_isMedicalItem = toString {
_list pushBack (configName _x); _list pushBack (configName _x);
} forEach (_fnc_isMedicalItem configClasses (configFile >> "CfgMagazines")); } forEach (_fnc_isMedicalItem configClasses (configFile >> "CfgMagazines"));
uiNamespace setVariable [QGVAR(treatmentItems), compileFinal str (_list arrayIntersect _list)] uiNamespace setVariable [QGVAR(treatmentItems), compileFinal (_list createHashMapFromArray [])]

2
addons/medical_treatment/script_component.hpp
View File

@ -55,4 +55,4 @@
// Animations that would be played faster than this are instead skipped. (= Progress bar too quick for animation). // Animations that would be played faster than this are instead skipped. (= Progress bar too quick for animation).
#define ANIMATION_SPEED_MAX_COEFFICIENT 2.5 #define ANIMATION_SPEED_MAX_COEFFICIENT 2.5
#define MEDICAL_TREATMENT_ITEMS (call (uiNamespace getVariable [QGVAR(treatmentItems), {[]}])) #define MEDICAL_TREATMENT_ITEMS (keys (uiNamespace getVariable QGVAR(treatmentItems)))