Inventory - Use maxLoad command (#673)

zen-mod · Aug 29, 2022 · 64fb5cd · 64fb5cd
1 parent 3473e81
commit 64fb5cd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/addons/context_actions/functions/fnc_canEditInventory.sqf b/addons/context_actions/functions/fnc_canEditInventory.sqf
@@ -17,6 +17,4 @@
 
 params ["_entity"];
 
-_entity isEqualType objNull
-&& {alive _entity}
-&& {getNumber (configOf _entity >> "maximumLoad") > 0}
+_entity isEqualType objNull && {alive _entity} && {maxLoad _entity > 0}
diff --git a/addons/inventory/XEH_preInit.sqf b/addons/inventory/XEH_preInit.sqf
@@ -14,7 +14,7 @@ PREP_RECOMPILE_END;
         [_entity] call FUNC(configure);
     },
     {
-        alive _entity && {getNumber (configOf _entity >> "maximumLoad") > 0}
+        alive _entity && {maxLoad _entity > 0}
     }
 ] call EFUNC(attributes,addButton);
 

diff --git a/addons/inventory/functions/fnc_configure.sqf b/addons/inventory/functions/fnc_configure.sqf
@@ -19,17 +19,13 @@ params ["_object"];
 
 if (!createDialog QGVAR(display)) exitWith {};
 
-private _config = configOf _object;
-private _displayName = getText (_config >> "displayName");
-private _maximumLoad = getNumber (_config >> "maximumLoad");
-
 // Get the object's current cargo and calculate its load
 private _cargo = [getItemCargo _object, getWeaponCargo _object, getMagazineCargo _object, getBackpackCargo _object];
 private _currentLoad = [_cargo] call FUNC(calculateLoad);
 
 private _display = uiNamespace getVariable QEGVAR(common,display);
 _display setVariable [QGVAR(currentLoad), _currentLoad];
-_display setVariable [QGVAR(maximumLoad), _maximumLoad];
+_display setVariable [QGVAR(maximumLoad), maxLoad _object];
 _display setVariable [QGVAR(object), _object];
 _display setVariable [QGVAR(cargo), _cargo];
 
@@ -38,7 +34,7 @@ _display setVariable [QGVAR(cargo), _cargo];
 
 // Set the display's title to the object name
 private _ctrlTitle = _display displayCtrl IDC_TITLE;
-_ctrlTitle ctrlSetText toUpper format [localize LSTRING(EditInventory), _displayName];
+_ctrlTitle ctrlSetText toUpper format [LLSTRING(EditInventory), getText (configOf _object >> "displayName")];
 
 // Refresh the items list when category is changed
 private _ctrlCategory = _display displayCtrl IDC_CATEGORY;

diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
@@ -10,7 +10,7 @@
 #define VERSION_AR  MAJOR,MINOR,PATCHLVL,BUILD
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 2.06
+#define REQUIRED_VERSION 2.08
 #define REQUIRED_CBA_VERSION {3,15,5}
 
 #ifdef COMPONENT_BEAUTIFIED