Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2025-07-25 04:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1362 from acemod/timeHasComeToday

Browse Source 
Fix Time Calc
This commit is contained in:
PabstMirror
2015-05-22 14:32:56 -05:00
parent 97a11f55fe f4bf6ea26d
commit f785fcc0d4
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/common/XEH_preInit.sqf
View File

@ -321,6 +321,8 @@ ACE_realTime = diag_tickTime;
ACE_virtualTime = diag_tickTime; ACE_virtualTime = diag_tickTime;
ACE_diagTime = diag_tickTime; ACE_diagTime = diag_tickTime;
ACE_gameTime = time; ACE_gameTime = time;
ACE_pausedTime = 0;
ACE_virtualPausedTime = 0;
PREP(timePFH); PREP(timePFH);
[FUNC(timePFH), 0, []] call cba_fnc_addPerFrameHandler; [FUNC(timePFH), 0, []] call cba_fnc_addPerFrameHandler;

9
addons/common/functions/fnc_timePFH.sqf
View File

@ -1,25 +1,26 @@
//#define DEBUG_MODE_FULL //#define DEBUG_MODE_FULL
#include "script_component.hpp" #include "script_component.hpp"
private["_lastRealTime", "_lastGameTime", "_delta"]; private["_lastTickTime", "_lastGameTime", "_delta"];
_lastRealTime = ACE_realTime; _lastTickTime = ACE_diagTime;
_lastGameTime = ACE_gameTime; _lastGameTime = ACE_gameTime;
ACE_gameTime = time; ACE_gameTime = time;
ACE_diagTime = diag_tickTime; ACE_diagTime = diag_tickTime;
_delta = ACE_diagTime - _lastRealTime; _delta = ACE_diagTime - _lastTickTime;
if(ACE_gameTime <= _lastGameTime) then { if(ACE_gameTime <= _lastGameTime) then {
TRACE_1("paused",_delta);
ACE_paused = true; ACE_paused = true;
// Game is paused or not running // Game is paused or not running
ACE_pausedTime = ACE_pausedTime + _delta; ACE_pausedTime = ACE_pausedTime + _delta;
ACE_virtualPausedTime = ACE_pausedTime + (_delta * accTime); ACE_virtualPausedTime = ACE_pausedTime + (_delta * accTime);
} else { } else {
TRACE_1("live",_delta);
ACE_paused = false; ACE_paused = false;
// Time is updating // Time is updating
ACE_realTime = ACE_realTime + _delta; ACE_realTime = ACE_realTime + _delta;
ACE_virtualTime = ACE_virtualTime + (_delta * accTime); ACE_virtualTime = ACE_virtualTime + (_delta * accTime);
ACE_time = ACE_virtualTime; ACE_time = ACE_virtualTime;
}; };