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

display carried weight in SI and imperial (#5918)

Browse Source
This commit is contained in:
commy2 2017-12-16 04:50:17 +01:00 committed by jonpas
parent 7bc396ba24
commit 0eccca6174
6 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/common/functions/fnc_getWeight.sqf
View File

@ -4,7 +4,7 @@
*
* Arguments:
* 0: The Unit (usually the player) <OBJECT>
* 0: Force a return type <SCALAR> (0: useImperial setting; 1: Metric; 2: Imperial)
* 1: Force a return type <SCALAR, BOOLEAN>
*
* Return Value:
* The return value <NUMBER>
@ -16,10 +16,9 @@
*/
#include "script_component.hpp"
params ["_unit", ["_returnFormat", 0, [0]]];
params ["_unit", ["_useImperial", false, [false, 0]]];
private _virtualLoad = 0;
private _useImperial = (!isNil QEGVAR(movement,useImperial) && {EGVAR(movement,useImperial)});
{
_virtualLoad = _virtualLoad + (_x getVariable [QEGVAR(movement,vLoad), 0]);
@ -33,7 +32,7 @@ private _useImperial = (!isNil QEGVAR(movement,useImperial) && {EGVAR(movement,u
private _weight = (loadAbs _unit + _virtualLoad) * 0.1;
//Return
if ([_useImperial, (_returnFormat == 1)] select (_returnFormat != 0)) then {
if (_useImperial in [true, 1]) then {
format ["%1lb", (round (_weight * 100)) / 100]
} else {
format ["%1kg", (round (_weight * (1/2.2046) * 100)) / 100]

8
addons/movement/ACE_Settings.hpp
View File

@ -1,8 +0,0 @@
class ACE_Settings {
class GVAR(useImperial) {
value = 0;
typeName = "BOOL";
isClientSettable = 1;
displayName = CSTRING(UseImperial);
};
};

1
addons/movement/CfgEventHandlers.hpp
View File

@ -1,4 +1,3 @@
class Extended_PreStart_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preStart));

1
addons/movement/XEH_PREP.hpp
View File

@ -1,4 +1,3 @@
PREP(addLoadToUnitContainer);
PREP(canClimb);
PREP(climb);

1
addons/movement/config.cpp
View File

@ -18,4 +18,3 @@ class CfgPatches {
#include "CfgFatigue.hpp"
#include "CfgMoves.hpp"
#include "CfgVehicles.hpp"
#include "ACE_Settings.hpp"

26
addons/movement/functions/fnc_inventoryDisplayLoad.sqf
View File

@ -13,17 +13,23 @@
*
* Public: No
*/
#include "script_component.hpp"
#include "script_component.hpp"
disableSerialization;
params ["_display"];
[{
disableSerialization;
params ["_dialog"];
private _fnc_update = {
params ["_display"];
private _control = _display displayCtrl 111;
if (isNull _dialog) exitWith {
[_this select 1] call CBA_fnc_removePerFrameHandler;
};
_control ctrlSetText format ["%1 - %2 %3 (%4)",
[ACE_player, false, true] call EFUNC(common,getName),
localize ELSTRING(common,Weight),
[ACE_player] call EFUNC(common,getWeight),
[ACE_player, true] call EFUNC(common,getWeight)
];
};
(_dialog displayCtrl 111) ctrlSetText format ["%1 - %2 %3", [ACE_player, false, true] call EFUNC(common,getName), localize ELSTRING(common,Weight), [ACE_player] call EFUNC(common,getWeight)];
}, 0, _this select 0] call CBA_fnc_addPerFrameHandler;
_display displayAddEventHandler ["MouseMoving", _fnc_update];
_display displayAddEventHandler ["MouseHolding", _fnc_update];
_display call _fnc_update;