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

Merge pull request #20 from Ghostrider-DbD-/v6.46-Build-20

Browse Source 
Fixed Typos and added missing code
This commit is contained in:
Ghostrider-DbD- 2016-12-20 00:09:05 -05:00 committed by GitHub
commit 96fb83b91e
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
@epochhive/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread.sqf
View File

@ -18,7 +18,7 @@ while {true} do
uiSleep blck_mainThreadUpdateInterval; uiSleep blck_mainThreadUpdateInterval;
if ((diag_tickTime - _timer1min) > 60) then if ((diag_tickTime - _timer1min) > 60) then
{ {
{ {
if (diag_tickTime > (_x select 1) ) then { if (diag_tickTime > (_x select 1) ) then {
//diag_log format["_fnc_mainTread:: cleaning up AI group %1",_x]; //diag_log format["_fnc_mainTread:: cleaning up AI group %1",_x];
@ -37,11 +37,15 @@ while {true} do
[] call GMS_fnc_cleanupDeadAI; [] call GMS_fnc_cleanupDeadAI;
if (_modType isEqualTo "Epoch") then {[] call blck_fnc_cleanEmptyGroups;}; // Exile cleans up empty groups automatically so this should not be needed with that mod. if (_modType isEqualTo "Epoch") then {[] call blck_fnc_cleanEmptyGroups;}; // Exile cleans up empty groups automatically so this should not be needed with that mod.
_timer1min = diag_tickTime;
}; };
if ((diag_tickTime - _timer5min) > 300) then { if ((diag_tickTime - _timer5min) > 180) then {
[] call blck_fnc_timeAcceleration; if (blck_timeAcceleration) then {
if (blck_debugON) then {diag_log "[blckeagls] calling time acceleration module";};
[] call blck_fnc_timeAcceleration;
};
if (blck_useHC) then {[] call blck_fnc_monitorHC;}; if (blck_useHC) then {[] call blck_fnc_monitorHC;};
_timer5min = diag_tickTime; _timer5min = diag_tickTime;
}; };

21
@epochhive/addons/custom_server/init/blck_init.sqf
View File

@ -13,7 +13,13 @@ _blck_loadingStartTime = diag_tickTime;
diag_log format["[blckeagls] Loading version %1 Build %2",_blck_versionDate,_blck_version]; diag_log format["[blckeagls] Loading version %1 Build %2",_blck_versionDate,_blck_version];
// spawn map addons to give the server time to position them before spawning in crates etc. // spawn map addons to give the server time to position them before spawning in crates etc.
call compileFinal preprocessFileLineNumbers "\q\addons\custom_server\MapAddons\MapAddons_init.sqf"; if (blck_spawnMapAddons) then
{
call compileFinal preprocessFileLineNumbers "\q\addons\custom_server\MapAddons\MapAddons_init.sqf";
}else{
diag_log "[blckegls] Map Addons disabled";
};
blck_spawnMapAddons = nil;
call compileFinal preprocessFileLineNumbers "\q\addons\custom_server\Compiles\blck_variables.sqf"; call compileFinal preprocessFileLineNumbers "\q\addons\custom_server\Compiles\blck_variables.sqf";
waitUntil {(isNil "blck_variablesLoaded") isEqualTo false;}; waitUntil {(isNil "blck_variablesLoaded") isEqualTo false;};
@ -69,6 +75,19 @@ diag_log format["blckeagls] waiting for players to join ---- >>>>"];
waitUntil{{isPlayer _x}count playableUnits > 0}; waitUntil{{isPlayer _x}count playableUnits > 0};
diag_log "[blckeagls] Player Connected, loading mission system"; diag_log "[blckeagls] Player Connected, loading mission system";
if (blck_spawnStaticLootCrates) then
{
blck_SLSComplete = false;
// Start the static loot crate spawner
[] execVM "\q\addons\custom_server\SLS\SLS_init.sqf";
waitUntil {(isNil "blck_SLSComplete") isEqualTo false;};
waitUntil{blck_SLSComplete};
blck_SLSComplete = nil;
}else{
diag_log "[blckeagls] SLS:: -- >> Static Loot Spawner disabled";
};
blck_spawnStaticLootCrates = nil;
//Start the mission timers //Start the mission timers
if (blck_enableOrangeMissions == 1) then if (blck_enableOrangeMissions == 1) then