From fe67224d23fd5cd4ec6eea61c770added710d3ec Mon Sep 17 00:00:00 2001 From: Ghostrider-DbD- Date: Thu, 26 Oct 2017 17:16:07 -0400 Subject: [PATCH] Bug fixes of errors in build 87 --- .../Functions/GMS_fnc_mainThread - Copy.sqf | 79 ------------------- .../Compiles/Functions/GMS_fnc_mainThread.sqf | 3 +- @GMS/addons/custom_server/init/build.sqf | 2 +- changeLog.sqf | 5 +- 4 files changed, 5 insertions(+), 84 deletions(-) delete mode 100644 @GMS/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread - Copy.sqf diff --git a/@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread - Copy.sqf b/@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread - Copy.sqf deleted file mode 100644 index abb5eb6..0000000 --- a/@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread - Copy.sqf +++ /dev/null @@ -1,79 +0,0 @@ -/* - By Ghostrider-DbD- - Last modified 8-15-17 - -------------------------- - License - -------------------------- - All the code and information provided here is provided under an Attribution Non-Commercial ShareAlike 4.0 Commons License. - - http://creativecommons.org/licenses/by-nc-sa/4.0/ -*/ -#include "\q\addons\custom_server\Configs\blck_defines.hpp"; - -diag_log format["starting _fnc_mainThread with time = %1",diag_tickTime]; - -#ifdef DBDserver -diag_log "running DBDServer version of _fnc_mainThread"; -#endif - -private["_modType","_timer1sec","_timer5sec","_timer20sec","_timer5min","_timer5min"]; -_timer1sec = diag_tickTime; -_timer5sec = diag_tickTime; -_timer20sec = diag_tickTime; -_timer1min = diag_tickTime; -_timer5min = diag_tickTime; -_modType = [] call blck_fnc_getModType; -while {true} do -{ - uiSleep 1; - //diag_log format["mainThread:: -- > time = %1",diag_tickTime]; - if (diag_tickTime - _timer1sec > 1) then - { - [] call blck_fnc_vehicleMonitor; - #ifdef DBDserver - [] call blck_fnc_broadcastServerFPS; - #endif - _timer1sec = diag_tickTime; - }; - if (diag_tickTime - _timer5sec > 5) then - { - _timer5sec = diag_tickTime; - [] call blck_fnc_missionGroupMonitor; - //[] call blck_fnc_sm_checkForPlayerNearMission; - }; - if (diag_tickTime - _timer20sec > 20) then - { - [] call blck_fnc_cleanupAliveAI; - [] call blck_fnc_cleanupObjects; - [] call blck_fnc_cleanupDeadAI; - _timer20sec = diag_tickTime; - //diag_log format["_mainThread::-->> diag_tickTime = %1",diag_tickTime]; - }; - if ((diag_tickTime - _timer1min) > 60) then - { - _timer1min = diag_tickTime; - [] call blck_fnc_timeAcceleration; - [] call blck_fnc_spawnPendingMissions; -; - if !(blck_useHC) then - { - diag_log format["_mainThread:: calling blck_fnc_passToHCs at diag_tickTime = %1",diag_tickTime]; - [] call blck_fnc_passToHCs; - }; - //[] call blck_fnc_missionGroupMonitor; - /* - // No longer needed - 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 (blck_useTimeAcceleration) then - { - if (diag_tickTime - _timer5min > 300) then { - - _timer5min = diag_tickTime; - }; - }; -}; diff --git a/@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread.sqf b/@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread.sqf index abb5eb6..bfb0cc1 100644 --- a/@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread.sqf +++ b/@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread.sqf @@ -52,9 +52,8 @@ while {true} do if ((diag_tickTime - _timer1min) > 60) then { _timer1min = diag_tickTime; - [] call blck_fnc_timeAcceleration; + if (blck_useTimeAcceleration) then {[] call blck_fnc_timeAcceleration}; [] call blck_fnc_spawnPendingMissions; -; if !(blck_useHC) then { diag_log format["_mainThread:: calling blck_fnc_passToHCs at diag_tickTime = %1",diag_tickTime]; diff --git a/@GMS/addons/custom_server/init/build.sqf b/@GMS/addons/custom_server/init/build.sqf index e6927fe..fb713f9 100644 --- a/@GMS/addons/custom_server/init/build.sqf +++ b/@GMS/addons/custom_server/init/build.sqf @@ -1,5 +1,5 @@ private ["_version","_versionDate"]; -blck_version = "6.72 Build 87"; +blck_version = "6.72 Build 88"; _blck_version = blck_version; _blck_versionDate = "10-13-17 6:00 PM"; blck_pvs_version = _blck_version; diff --git a/changeLog.sqf b/changeLog.sqf index 06144cc..eb1b8ef 100644 --- a/changeLog.sqf +++ b/changeLog.sqf @@ -5,7 +5,7 @@ Contributions by Narines: bug fixes, testing, infinite ammo fix. Ideas or code from that by Vampire and KiloSwiss have been used for certain functions. Significant Changes: -Version 6.72 Build 81 +Version 6.72 Build 88 [Added] Support for headless clients. This functionality works for one HC regardless of the name used for HCs. [Added] Added an optional variable for mission patrol vehicles: _missionPatrolVehicles One can use this variable to defin the spawn position and types of vehicles spawned at missions. @@ -14,7 +14,8 @@ Version 6.72 Build 81 [Changed] Crates can now be lifted only AFTER a mission is completed. [Changed] The client is now activated using remoteExec instead of a public variable. **** Please be sure to update the files in the debug folder on your client. - +[Fixed] Typos (Thank you to Brian Soanes) +[Fixed] setting blck_useTimeAcceleration = false did not disable this function. Version 6.71 Build 77 [Added] HandleDamage Event Handler for Armed Vehicles to increase their interaction with players.