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

Final updates to \Compiles\Functions

Browse Source 
These include HeMan's code tweaks and changes for V 6.88
This commit is contained in:
Chris Cardozo 2018-11-19 10:02:30 -05:00
parent 6891c96136
commit cff1ca109d
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_addMoneyToObject.sqf
View File

@ -12,14 +12,14 @@
*/ */
#include "\q\addons\custom_server\Configs\blck_defines.hpp"; #include "\q\addons\custom_server\Configs\blck_defines.hpp";
params["_obj","_difficulty"]; params["_obj","_difficulty"];
private _mod = [] call blck_fnc_getModType;
#ifdef blck_debugMode #ifdef blck_debugMode
{ {
diag_log format["_fnc_addMoneyToOject: _this select %1 = %2",_foreachindex, _this select _foreachindex]; diag_log format["_fnc_addMoneyToOject: _this select %1 = %2",_foreachindex, _this select _foreachindex];
}forEach _this; }forEach _this;
#endif #endif
if (_mod isEqualTo "Exile") then if ((tolower blck_modType) isEqualTo "exile") then
{ {
switch (_difficulty) do switch (_difficulty) do
{ {
@ -33,7 +33,7 @@ if (_mod isEqualTo "Exile") then
}; };
}; };
if (_mod isEqualTo "Epoch") then if ((tolower blck_modType) isEqualTo "epoch") then
{ {
switch (_difficulty) do switch (_difficulty) do
{ {

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

@ -10,8 +10,6 @@
*/ */
#include "\q\addons\custom_server\Configs\blck_defines.hpp"; #include "\q\addons\custom_server\Configs\blck_defines.hpp";
//diag_log format["starting _fnc_mainThread with time = %1",diag_tickTime];
private["_timer1sec","_timer5sec","_timer20sec","_timer5min","_timer5min"]; private["_timer1sec","_timer5sec","_timer20sec","_timer5min","_timer5min"];
_timer1sec = diag_tickTime; _timer1sec = diag_tickTime;
_timer5sec = diag_tickTime; _timer5sec = diag_tickTime;
@ -22,19 +20,19 @@ _timer5min = diag_tickTime;
while {true} do while {true} do
{ {
uiSleep 1; uiSleep 1;
//diag_log format["mainThread:: -- > time = %1",diag_tickTime];
if (diag_tickTime > _timer1sec) then if (diag_tickTime > _timer1sec) then
{ {
[] call blck_fnc_vehicleMonitor; [] call blck_fnc_vehicleMonitor;
#ifdef GRGserver
[] call blck_fnc_broadcastServerFPS;
#endif
_timer1sec = diag_tickTime + 1; _timer1sec = diag_tickTime + 1;
//diag_log format["[blckeagls] _fnc_mainThread 1 Second Timer Handled | Timstamp %1",diag_tickTime];
}; };
if (diag_tickTime > _timer5sec) then if (diag_tickTime > _timer5sec) then
{ {
_timer5sec = diag_tickTime + 5; _timer5sec = diag_tickTime + 5;
[] call blck_fnc_missionGroupMonitor; [] call blck_fnc_missionGroupMonitor;
[] call blck_fnc_sm_missionPatrolMonitor; [] call blck_fnc_sm_missionPatrolMonitor;
//diag_log format["[blckeagls] _fnc_mainThread 5 Second Timer Handled | Timstamp %1",diag_tickTime];
}; };
if (diag_tickTime > _timer20sec) then if (diag_tickTime > _timer20sec) then
{ {
@ -42,26 +40,19 @@ while {true} do
[] call blck_fnc_cleanupObjects; [] call blck_fnc_cleanupObjects;
[] call blck_fnc_cleanupDeadAI; [] call blck_fnc_cleanupDeadAI;
[] call blck_fnc_scanForPlayersNearVehicles; [] call blck_fnc_scanForPlayersNearVehicles;
//[] call blck_fnc_cleanEmptyGroups; [] call blck_fnc_cleanEmptyGroups;
_timer20sec = diag_tickTime + 20; _timer20sec = diag_tickTime + 20;
//diag_log format["[blckeagls] _fnc_mainThread 20 Second Timer Handled | Timstamp %1",diag_tickTime];
}; };
if ((diag_tickTime > _timer1min)) then if ((diag_tickTime > _timer1min)) then
{ {
//diag_log format["_fnc_mainThread: 60 second events run at %1",diag_tickTime];
_timer1min = diag_tickTime + 60; _timer1min = diag_tickTime + 60;
//diag_log format["_fnc_mainThread: blck_missionsRunning = %1 | blck_maxSpawnedMissions = %2", blck_missionsRunning,blck_maxSpawnedMissions];
[] call blck_fnc_spawnPendingMissions; [] call blck_fnc_spawnPendingMissions;
//diag_log format["_fnc_mainThread: blck_numberUnderwaterDynamicMissions = %1 | blck_dynamicUMS_MissionsRuning = %2",blck_numberUnderwaterDynamicMissions,blck_dynamicUMS_MissionsRuning];
if (blck_dynamicUMS_MissionsRuning < blck_numberUnderwaterDynamicMissions) then if (blck_dynamicUMS_MissionsRuning < blck_numberUnderwaterDynamicMissions) then
{ {
//diag_log "Adding dynamic UMS Mission";
[] spawn blck_fnc_addDyanamicUMS_Mission; [] spawn blck_fnc_addDyanamicUMS_Mission;
}; };
//diag_log format["_fnc_mainThread: control returned to _fnc_mainThread from _fnc_addDynamicUMS_Mission at %1",diag_tickTime];
if (blck_useHC) then if (blck_useHC) then
{ {
//diag_log format["_mainThread:: calling blck_fnc_passToHCs at diag_tickTime = %1",diag_tickTime];
[] call blck_fnc_HC_passToHCs; [] call blck_fnc_HC_passToHCs;
}; };
if (blck_useTimeAcceleration) then if (blck_useTimeAcceleration) then
@ -73,7 +64,6 @@ while {true} do
//diag_log format["_fnc_mainThread: active SQFscripts include: %1",diag_activeSQFScripts]; //diag_log format["_fnc_mainThread: active SQFscripts include: %1",diag_activeSQFScripts];
diag_log format["_fnc_mainThread: active scripts include: %1",diag_activeScripts]; diag_log format["_fnc_mainThread: active scripts include: %1",diag_activeScripts];
#endif #endif
//diag_log format["[blckeagls] _fnc_mainThread 60 Second Timer Handled | Timstamp %1",diag_tickTime];
}; };
if (diag_tickTime > _timer5min) then if (diag_tickTime > _timer5min) then
{ {