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

Merge pull request #3516 from acemod/cbamissiontime

Browse Source 
replace timePFH with CBA_missionTime
This commit is contained in:
commy2
2016-05-30 21:23:57 +02:00
parent f6359907a3 7512c4e52e
commit fd26e2e44e
111 changed files with 291 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
addons/interact_menu/functions/fnc_render.sqf
View File

@ -51,7 +51,7 @@ if (GVAR(openedMenuType) >= 0) then {
private _closest = GVAR(currentOptions) select _closestSelection;
_closest params ["_action", "_sPos", "_hoverPath"];
private _cTime = ACE_diagTime;
private _cTime = diag_tickTime;
private _delta = _cTime - GVAR(lastTime);
GVAR(lastTime) = _cTime;
@ -65,17 +65,17 @@ if (GVAR(openedMenuType) >= 0) then {
private _misMatch = !(GVAR(lastPath) isEqualTo _hoverPath);
if(_misMatch && {ACE_diagTime-GVAR(expandedTime) > linearConversion [0, 2, GVAR(menuAnimationSpeed), 0.25, 0.08333333]}) then {
GVAR(startHoverTime) = ACE_diagTime;
if(_misMatch && {diag_tickTime-GVAR(expandedTime) > linearConversion [0, 2, GVAR(menuAnimationSpeed), 0.25, 0.08333333]}) then {
GVAR(startHoverTime) = diag_tickTime;
GVAR(lastPath) = _hoverPath;
GVAR(expanded) = false;
} else {
if(!GVAR(expanded) && {ACE_diagTime-GVAR(startHoverTime) > linearConversion [0, 2, GVAR(menuAnimationSpeed), 0.25, 0.08333333]}) then {
if(!GVAR(expanded) && {diag_tickTime-GVAR(startHoverTime) > linearConversion [0, 2, GVAR(menuAnimationSpeed), 0.25, 0.08333333]}) then {
GVAR(expanded) = true;
// Start the expanding menu animation only if the user is not going up the menu
if !([GVAR(menuDepthPath),GVAR(lastPath)] call FUNC(isSubPath)) then {
GVAR(expandedTime) = ACE_diagTime;
GVAR(expandedTime) = diag_tickTime;
};
GVAR(menuDepthPath) = +GVAR(lastPath);