From d780c02ef17aa39eede00979a4e9617e115aeec3 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 9 Oct 2021 15:32:53 -0500 Subject: [PATCH] Misc - Adjust some functions to be more compatible with sqfvm (#8494) --- addons/common/dev/test_mapConfigs.sqf | 2 +- addons/common/functions/fnc_getMapGridData.sqf | 2 +- .../medical_statemachine/functions/fnc_localityChangedEH.sqf | 2 +- addons/refuel/functions/fnc_connectNozzleAction.sqf | 2 +- addons/ui/XEH_clientInit.sqf | 4 +--- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/common/dev/test_mapConfigs.sqf b/addons/common/dev/test_mapConfigs.sqf index 1b114d79e3..1b5c8b04a9 100644 --- a/addons/common/dev/test_mapConfigs.sqf +++ b/addons/common/dev/test_mapConfigs.sqf @@ -22,7 +22,7 @@ private _maps = configProperties [configFile >> "CfgWorldList", "(isClass _x)", }; // Test MGRS grid step size (from ace_common_fnc_getMapGridData) - private _zoomMax = 1e99; + private _zoomMax = 1e38; private _formatX = ""; private _formatY = ""; private _stepX = 1e10; diff --git a/addons/common/functions/fnc_getMapGridData.sqf b/addons/common/functions/fnc_getMapGridData.sqf index f5e91e427e..08d5820309 100644 --- a/addons/common/functions/fnc_getMapGridData.sqf +++ b/addons/common/functions/fnc_getMapGridData.sqf @@ -23,7 +23,7 @@ GVAR(mapGridData) = []; private _cfgGrid = configFile >> "CfgWorlds" >> worldName >> "Grid"; private _offsetX = getNumber (_cfgGrid >> "offsetX"); private _offsetY = getNumber (_cfgGrid >> "offsetY"); -private _zoomMax = 1e99; +private _zoomMax = 1e38; private _formatX = ""; private _formatY = ""; private _stepX = 1e10; diff --git a/addons/medical_statemachine/functions/fnc_localityChangedEH.sqf b/addons/medical_statemachine/functions/fnc_localityChangedEH.sqf index 9e5fb3c9b5..80486601f5 100644 --- a/addons/medical_statemachine/functions/fnc_localityChangedEH.sqf +++ b/addons/medical_statemachine/functions/fnc_localityChangedEH.sqf @@ -56,7 +56,7 @@ if (_isLocal) then { /* // Not sure if this is even needed, idea is that on locality transfer we broadcast more up to date info - private _lastTimeUpdated = _unit getVariable [QEGVAR(medical_vitals,lastTimeUpdated), 1e99]; + private _lastTimeUpdated = _unit getVariable [QEGVAR(medical_vitals,lastTimeUpdated), 1e38]; private _deltaT = CBA_missionTime - _lastTimeUpdated; TRACE_1("not local",_deltaT); if (_deltaT < 5) then { diff --git a/addons/refuel/functions/fnc_connectNozzleAction.sqf b/addons/refuel/functions/fnc_connectNozzleAction.sqf index 7c626c2359..8485bddd8f 100644 --- a/addons/refuel/functions/fnc_connectNozzleAction.sqf +++ b/addons/refuel/functions/fnc_connectNozzleAction.sqf @@ -23,7 +23,7 @@ params [["_unit", objNull, [objNull]], ["_sink", objNull, [objNull]], ["_startin private _bestPosASL = []; -private _bestPosDistance = 1e99; +private _bestPosDistance = 1e38; private _viewPos = _startingPosASL vectorAdd (((positionCameraToWorld [0,0,0]) vectorFromTo (positionCameraToWorld [0,0,1])) vectorMultiply 3); private _modelVector = _startingPosASL vectorFromTo (AGLtoASL (_sink modelToWorld [0,0,0])); private _modelVectorLow = _startingPosASL vectorFromTo (AGLtoASL (_sink modelToWorld [0,0,-1])); diff --git a/addons/ui/XEH_clientInit.sqf b/addons/ui/XEH_clientInit.sqf index d0a3ab497c..9913c2d23e 100644 --- a/addons/ui/XEH_clientInit.sqf +++ b/addons/ui/XEH_clientInit.sqf @@ -35,9 +35,7 @@ GVAR(elementsSet) = call CBA_fnc_createNamespace; // On changing settings ["CBA_SettingChanged", { params ["_name", "_value"]; - - private _delimPos = count QUOTE(DOUBLES(ADDON,)); - if (_name select [0, _delimPos] != QUOTE(DOUBLES(ADDON,))) exitWith {}; + if (_name select [0, 7] != "ace_ui_") exitWith {}; if (_name in ELEMENTS_BASIC) then { [true] call FUNC(setElements);