Arma3_Epoch/blckeagles-revisited-RC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed error wherein time acceleration was always ON.

Browse Source
This commit is contained in:
Ghostrider-DbD- 2018-02-02 20:19:16 -05:00
parent 89fd7cff40
commit 42cdbf7b83
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread.sqf
View File

@ -54,7 +54,6 @@ while {true} do
{ {
//diag_log format["_fnc_mainThread: 60 second events run at %1",diag_tickTime]; //diag_log format["_fnc_mainThread: 60 second events run at %1",diag_tickTime];
_timer1min = diag_tickTime; _timer1min = diag_tickTime;
[] call blck_fnc_timeAcceleration;
[] call blck_fnc_spawnPendingMissions; [] call blck_fnc_spawnPendingMissions;
//diag_log format["_fnc_spawnPendingMissions: blck_numberUnderwaterDynamicMissions = %1 | //diag_log format["_fnc_spawnPendingMissions: blck_numberUnderwaterDynamicMissions = %1 |
if (blck_dynamicUMS_MissionsRuning < blck_numberUnderwaterDynamicMissions) then if (blck_dynamicUMS_MissionsRuning < blck_numberUnderwaterDynamicMissions) then
@ -84,12 +83,12 @@ while {true} do
diag_log format["_fnc_mainThread: active scripts include: %1",diag_activeScripts]; diag_log format["_fnc_mainThread: active scripts include: %1",diag_activeScripts];
#endif #endif
}; };
if (diag_tickTime - _timer5min > 300) then
{
if (blck_useTimeAcceleration) then if (blck_useTimeAcceleration) then
{ {
if (diag_tickTime - _timer5min > 300) then {
_timer5min = diag_tickTime; _timer5min = diag_tickTime;
[] call blck_fnc_timeAcceleration;
}; };
}; };
}; };

9
@GMS/addons/custom_server/Compiles/TimeAccel/GMS_fnc_Time.sqf
View File

@ -30,9 +30,10 @@ _time = dayTime;
// blck_debugMode3 // blck_debugMode3
#ifdef blck_debugMode #ifdef blck_debugMode
if (blck_debugLevel > 2) then if (blck_debugLevel >= 2) then
{ {
diag_log "fnc_Time:: Debug settings ON"; diag_log "fnc_Time:: Debug settings ON";
diag_log format["_fnc_Time:: --> blck_useTimeAcceleration = %1", blck_useTimeAcceleration];
diag_log format["_fnc_Time:: -- > _sunrise = %1 | _sunset = %2 | _time = %3",_sunrise,_sunset,_time]; diag_log format["_fnc_Time:: -- > _sunrise = %1 | _sunset = %2 | _time = %3",_sunrise,_sunset,_time];
}; };
#endif #endif
@ -41,7 +42,7 @@ if (blck_debugLevel > 2) then
if (_time > (_sunset + 0.5) || _time < (_sunrise - 0.5)) exitWith { if (_time > (_sunset + 0.5) || _time < (_sunrise - 0.5)) exitWith {
setTimeMultiplier blck_timeAccelerationNight; setTimeMultiplier blck_timeAccelerationNight;
#ifdef blck_debugMode #ifdef blck_debugMode
if (blck_debugLevel > 2) then if (blck_debugLevel >= 2) then
{ {
diag_log format["NIGHT TIMGE ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime]; diag_log format["NIGHT TIMGE ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
}; };
@ -53,7 +54,7 @@ if (_time > (_sunrise + 0.5) && _time < (_sunset - 0.5)) exitWith {
setTimeMultiplier blck_timeAccelerationDay; setTimeMultiplier blck_timeAccelerationDay;
//diag_log format["DAYTIME ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime]; //diag_log format["DAYTIME ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
#ifdef blck_debugMode #ifdef blck_debugMode
if (blck_debugLevel > 2) then if (blck_debugLevel >= 2) then
{ {
diag_log format["DAYTIME ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime]; diag_log format["DAYTIME ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
}; };
@ -63,7 +64,7 @@ if (_time > (_sunrise + 0.5) && _time < (_sunset - 0.5)) exitWith {
// default // default
setTimeMultiplier blck_timeAccelerationDusk; setTimeMultiplier blck_timeAccelerationDusk;
#ifdef blck_debugMode #ifdef blck_debugMode
if (blck_debugLevel > 2) then if (blck_debugLevel >= 2) then
{ {
diag_log format["DUSK ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime]; diag_log format["DUSK ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
}; };