diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 6ccad02..530158b 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 1 #define MINOR 5 -#define PATCH 0 +#define PATCH 1 #define BUILD 1 \ No newline at end of file diff --git a/addons/startmarkers/functions/fnc_createOthereMarkers.sqf b/addons/startmarkers/functions/fnc_createOthereMarkers.sqf index b73f755..fa4d1ba 100644 --- a/addons/startmarkers/functions/fnc_createOthereMarkers.sqf +++ b/addons/startmarkers/functions/fnc_createOthereMarkers.sqf @@ -45,7 +45,7 @@ private _deleteMarkerTime = GVAR(deleteMarkerTime); { _x params ["_classname", "_texts", "_pos", "_direction", "_color", "_updateTime"]; - if ( !(_updateTime < 0) && {(_lastUpdateTime > (_deleteMarkerTime + _updateTime))}) exitWith { + if ((_updateTime >= 0) && {(_lastUpdateTime > (_deleteMarkerTime + _updateTime))}) exitWith { private _logText = format ["other marker %1 has not been updated long time, so it is skipped", _texts select 0]; LOG(_logText); }; diff --git a/addons/startmarkers/functions/fnc_createSquadMarkers.sqf b/addons/startmarkers/functions/fnc_createSquadMarkers.sqf index e2bfe19..494e35b 100644 --- a/addons/startmarkers/functions/fnc_createSquadMarkers.sqf +++ b/addons/startmarkers/functions/fnc_createSquadMarkers.sqf @@ -47,13 +47,13 @@ private _deleteMarkerTime = GVAR(deleteMarkerTime); { _x params ["_icon", "_pos", "_color", "_group", "_text", "_updateTime", "_hide"]; - if ( !(_updateTime < 0) && {(_lastUpdateTime > ( _deleteMarkerTime + _updateTime))}) exitWith { + if ((_updateTime >= 0) && {(_lastUpdateTime > ( _deleteMarkerTime + _updateTime))}) exitWith { private _logText = format ["Marker %1 has not been updated long time, so it is skipped. Should be deleted in next update.",_text]; LOG(_logText); }; private _alpha = 1; - if ( !(_updateTime < 0) && {(_lastUpdateTime > ( _lostContactTime + _updateTime))}) then { + if ((_updateTime >= 0) && {(_lastUpdateTime > ( _lostContactTime + _updateTime))}) then { _alpha = 0.5; }; diff --git a/addons/startmarkers/functions/fnc_createVehicleIcon.sqf b/addons/startmarkers/functions/fnc_createVehicleIcon.sqf index ebcac2e..6cc7f77 100644 --- a/addons/startmarkers/functions/fnc_createVehicleIcon.sqf +++ b/addons/startmarkers/functions/fnc_createVehicleIcon.sqf @@ -37,7 +37,7 @@ if (!isNull _dialogDisplay) then { }; -if ( !(_updateTime < 0) && {(_lastUpdateTime > ( _lostContactTime + _updateTime))}) then { +if ((_updateTime >= 0) && {(_lastUpdateTime > ( _lostContactTime + _updateTime))}) then { _color set [-1, 0.5]; }; diff --git a/addons/startmarkers/functions/fnc_createVehicleMarkers.sqf b/addons/startmarkers/functions/fnc_createVehicleMarkers.sqf index 8cea893..00fa31e 100644 --- a/addons/startmarkers/functions/fnc_createVehicleMarkers.sqf +++ b/addons/startmarkers/functions/fnc_createVehicleMarkers.sqf @@ -48,7 +48,7 @@ private _deleteMarkerTime = GVAR(deleteMarkerTime); { _x params ["_classname", "_texts", "_pos", "_direction", "_color", "_updateTime"]; - if ( !(_updateTime < 0) && {(_lastUpdateTime > (_deleteMarkerTime + _updateTime))}) exitWith { + if ((_updateTime >= 0) && {(_lastUpdateTime > (_deleteMarkerTime + _updateTime))}) exitWith { private _logText = format ["Vehicle marker %1 has not been updated long time, so it is skipped", _texts select 0]; LOG(_logText); }; diff --git a/addons/startmarkers/functions/fnc_filterData.sqf b/addons/startmarkers/functions/fnc_filterData.sqf index 01771b8..2d5a217 100644 --- a/addons/startmarkers/functions/fnc_filterData.sqf +++ b/addons/startmarkers/functions/fnc_filterData.sqf @@ -34,7 +34,7 @@ private _deleteMarkerTime = GVAR(deleteMarkerTime); private _value = _y; private _valueUpdateTime = _value select 5; - if (( !(_valueUpdateTime < 0) && {(_lastUpdateTime > ( _deleteMarkerTime + _valueUpdateTime))})) then { + if (((_valueUpdateTime >= 0) && {(_lastUpdateTime > ( _deleteMarkerTime + _valueUpdateTime))})) then { _hash deleteAt _key; }; } forEach _hash; diff --git a/addons/utilities/functions/fnc_loadScreen.sqf b/addons/utilities/functions/fnc_loadScreen.sqf index 54cf002..5875dce 100644 --- a/addons/utilities/functions/fnc_loadScreen.sqf +++ b/addons/utilities/functions/fnc_loadScreen.sqf @@ -18,7 +18,8 @@ if (!isMultiplayer) exitWith { LOG("Skip desync load screen in SP"); }; // skip [{!isNull player && !isNull findDisplay 12 && !isNil QGVAR(runLoadScreen)}, { if (!GVAR(runLoadScreen)) exitWith { INFO("Desync load screen disabled"); }; - if (count allPlayers < 10) exitWith { INFO("Desync load disabled under 10 players"); }; + private _allPlayers = count(call BIS_fnc_listPlayers); + if (_allPlayers < 10) exitWith { INFO("Desync load disabled under 10 players"); }; if !(playerSide in [west, east, resistance, civilian]) exitWith { INFO("Not in right side, so skip desync load screen"); }; if (10*60 < cba_missiontime) exitWith { INFO("Mission has started already"); }; INFO("Start desync load screen");