From 61c99cb5d8ec42e22637be181327d7617d6ac8a3 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 8 Dec 2017 21:39:35 -0600 Subject: [PATCH] Attempt to make enum errors more clear (#5876) * Add note to enum script error * Bump Arma/CBA versions * req 1.78 --- addons/common/XEH_postInit.sqf | 11 ++++++----- addons/main/script_mod.hpp | 4 ++-- addons/movement/functions/fnc_handleVirtualMass.sqf | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf index 1958c0978c..4f4b61ed7b 100644 --- a/addons/common/XEH_postInit.sqf +++ b/addons/common/XEH_postInit.sqf @@ -48,15 +48,16 @@ [QGVAR(setHidden), { params ["_object", "_set"]; TRACE_2("setHidden EH",_object,_set); - private _visibility = _object getUnitTrait "camouflageCoef"; + INFO("Note: getUnitTrait / camouflageCoef enum error can be ignored [present since Arma 3 v1.78] - IGNORE THIS"); + private _vis = _object getUnitTrait "camouflageCoef"; if (_set > 0) then { - if (_visibility != 0) then { - _object setVariable [QGVAR(oldVisibility), _visibility]; + if (_vis != 0) then { + _object setVariable [QGVAR(oldVisibility), _vis]; _object setUnitTrait ["camouflageCoef", 0]; }; } else { - _visibility = _object getVariable [QGVAR(oldVisibility), _visibility]; - _object setUnitTrait ["camouflageCoef", _visibility]; + _vis = _object getVariable [QGVAR(oldVisibility), _vis]; + _object setUnitTrait ["camouflageCoef", _vis]; }; }] call CBA_fnc_addEventHandler; diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index cd6d49c4e1..04785a35a6 100644 --- a/addons/main/script_mod.hpp +++ b/addons/main/script_mod.hpp @@ -9,8 +9,8 @@ #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD // MINIMAL required version for the Mod. Components can specify others.. -#define REQUIRED_VERSION 1.76 -#define REQUIRED_CBA_VERSION {3,4,1} +#define REQUIRED_VERSION 1.78 +#define REQUIRED_CBA_VERSION {3,5,0} #ifdef COMPONENT_BEAUTIFIED #define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED) diff --git a/addons/movement/functions/fnc_handleVirtualMass.sqf b/addons/movement/functions/fnc_handleVirtualMass.sqf index 7db3e9967a..69a52d1bfd 100644 --- a/addons/movement/functions/fnc_handleVirtualMass.sqf +++ b/addons/movement/functions/fnc_handleVirtualMass.sqf @@ -40,7 +40,7 @@ private _absLoad = getNumber (configFile >> "CfgInventoryGlobalVariable" >> "max private _loadCoef = _unit getVariable QGVAR(loadCoef); if (isNil "_loadCoef") then { - INFO("Note: getUnitTrait / loadCoef enum error can be ignored [present in Arma 3 v1.78+]"); + INFO("Note: getUnitTrait / loadCoef enum error can be ignored [present since Arma 3 v1.78] - IGNORE THIS"); _loadCoef = _unit getUnitTrait "loadCoef"; _unit setVariable [QGVAR(loadCoef), _loadCoef, true]; };