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

Parachute - Fix "hide altimeter" setting (#6721)

Browse Source 
* Fix hide altimeter setting not working

Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>

* Clean up altimeter PFH

* Put ! back inside
This commit is contained in:
Josuan Albin 2018-12-06 23:36:35 +01:00 committed by PabstMirror
parent fddc6c2f4d
commit de828a2997
3 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/common/RscInfoType.hpp
View File

@ -6,7 +6,7 @@ class RscInGameUI {
}; };
class RscUnitInfoSoldier: RscUnitInfo { class RscUnitInfoSoldier: RscUnitInfo {
onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgSoldier', _this select 0)];); onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgSoldier', _this select 0)]; [ARR_2('ace_infoDisplayChanged', [ARR_2(_this select 0, 'Soldier')])] call CBA_fnc_localEvent;);
}; };
class RscUnitInfoTank: RscUnitInfo { class RscUnitInfoTank: RscUnitInfo {
@ -94,7 +94,7 @@ class RscInGameUI {
}; };
class RscUnitInfoParachute: RscUnitInfo { class RscUnitInfoParachute: RscUnitInfo {
onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgParachute', _this select 0)];); onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgParachute', _this select 0)]; [ARR_2('ace_infoDisplayChanged', [ARR_2(_this select 0, 'Parachute')])] call CBA_fnc_localEvent;);
}; };
class RscUnitVehicle { class RscUnitVehicle {

1
addons/parachute/functions/fnc_handleInfoDisplayChanged.sqf
View File

@ -37,4 +37,3 @@ switch (_type) do {
} forEach [380, 382]; } forEach [380, 382];
}; };
}; };
nil // switch might return true if no case was found. Just to make sure the return value matches

47
addons/parachute/functions/fnc_showAltimeter.sqf
View File

@ -22,28 +22,47 @@ if (isNull (uiNamespace getVariable ["ACE_Altimeter", displayNull])) exitWith {}
GVAR(AltimeterActive) = true; GVAR(AltimeterActive) = true;
[{ private _display = uiNamespace getVariable ["ACE_Altimeter", displayNull];
if (!GVAR(AltimeterActive)) exitWith {[_this select 1] call CBA_fnc_removePerFrameEventHandler}; private _HeightText = _display displayCtrl 1100;
disableSerialization; private _DecendRate = _display displayCtrl 1000;
(_this select 0) params ["_display", "_unit", "_oldHeight", "_prevTime"]; private _TimeText = _display displayCtrl 1001;
if !("ACE_Altimeter" in assignedItems _unit) exitWith {[_this select 1] call CBA_fnc_removePerFrameEventHandler; call FUNC(hideAltimeter)};
private _HeightText = _display displayCtrl 1100; [{
private _DecendRate = _display displayCtrl 1000; _this params ["_args", "_pfhID"];
private _TimeText = _display displayCtrl 1001; _args params ["_unit", "_oldHeight", "_prevTime", "_HeightText", "_DecendRate", "_TimeText"];
if !(GVAR(AltimeterActive)) exitWith {
_pfhID call CBA_fnc_removePerFrameEventHandler;
};
if !("ACE_Altimeter" in assignedItems _unit) exitWith {
call FUNC(hideAltimeter);
_pfhID call CBA_fnc_removePerFrameEventHandler;
};
private _hour = floor daytime; private _hour = floor daytime;
private _minute = floor ((daytime - _hour) * 60); private _minute = floor ((daytime - _hour) * 60);
private _height = ((getPosASL _unit) select 2) + EGVAR(common,mapAltitude);
private _curTime = CBA_missionTime; private _curTime = CBA_missionTime;
private _timeDiff = _curTime - _prevTime; private _timeDiff = _curTime - _prevTime;
private _descentRate = if (_timeDiff > 0) then {floor((_oldHeight - _height) / _timeDiff)} else {0};
private _height = ((getPosASL _unit) select 2) + EGVAR(common,mapAltitude);
private _descentRate = if (_timeDiff > 0) then {
floor((_oldHeight - _height) / _timeDiff)
} else {
0
};
_TimeText ctrlSetText (format ["%1:%2", [_hour, 2] call CBA_fnc_formatNumber, [_minute, 2] call CBA_fnc_formatNumber]); _TimeText ctrlSetText (format ["%1:%2", [_hour, 2] call CBA_fnc_formatNumber, [_minute, 2] call CBA_fnc_formatNumber]);
_HeightText ctrlSetText (format ["%1", floor _height]); _HeightText ctrlSetText (format ["%1", floor _height]);
_DecendRate ctrlSetText (format ["%1", _descentRate max 0]); _DecendRate ctrlSetText (format ["%1", _descentRate max 0]);
(_this select 0) set [2, _height]; (_this select 0) set [1, _height];
(_this select 0) set [3, _curTime]; (_this select 0) set [2, _curTime];
}, 0.2, [uiNamespace getVariable ["ACE_Altimeter", displayNull], _unit, floor ((getPosASL _unit) select 2), CBA_missionTime]] call CBA_fnc_addPerFrameHandler; }, 0.2, [
_unit,
floor ((getPosASL _unit) select 2),
CBA_missionTime,
_HeightText,
_DecendRate,
_TimeText
]] call CBA_fnc_addPerFrameHandler;