From 7b8fbe10b23e4d74e984c57bc7ddcea8876a4a5e Mon Sep 17 00:00:00 2001 From: commy2 Date: Sun, 25 Nov 2018 15:02:27 +0100 Subject: [PATCH 1/2] fix moved markers not synched --- addons/markers/functions/fnc_movePFH.sqf | 3 ++- addons/markers/script_component.hpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/markers/functions/fnc_movePFH.sqf b/addons/markers/functions/fnc_movePFH.sqf index 144fce6ff00..962f39d3284 100644 --- a/addons/markers/functions/fnc_movePFH.sqf +++ b/addons/markers/functions/fnc_movePFH.sqf @@ -22,8 +22,9 @@ if (isNull _ctrlMap || !GVAR(moving)) exitWith { (_this select 1) call CBA_fnc_removePerFrameHandler; private _finalPos = getMarkerPos _marker; + private _overrule = [QGVAR(markerMoveEnded), [ACE_player, _marker, _originalPos, _finalPos]] call CBA_fnc_localEvent; - if !([QGVAR(markerMoveEnded), [ACE_player, _marker, _originalPos, _finalPos]] call CBA_fnc_localEvent) then { + if (!isNil "_overrule" && {_overrule isEqualTo true}) then { _marker setMarkerPosLocal _originalPos; } else { [QGVAR(setMarkerPosLocal), [_marker, _finalPos]] call CBA_fnc_globalEvent; diff --git a/addons/markers/script_component.hpp b/addons/markers/script_component.hpp index fdb5f1614e3..7a79d44568a 100644 --- a/addons/markers/script_component.hpp +++ b/addons/markers/script_component.hpp @@ -2,8 +2,8 @@ #define COMPONENT_BEAUTIFIED Markers #include "\z\ace\addons\main\script_mod.hpp" -// #define DEBUG_MODE_FULL -// #define DISABLE_COMPILE_CACHE +#define DEBUG_MODE_FULL +#define DISABLE_COMPILE_CACHE // #define ENABLE_PERFORMANCE_COUNTERS #ifdef DEBUG_ENABLED_MARKERS From d0bbc111bccadfaf83b5e62a23f7c0776ceb514e Mon Sep 17 00:00:00 2001 From: commy2 Date: Sun, 25 Nov 2018 15:05:05 +0100 Subject: [PATCH 2/2] disable debug mode --- addons/markers/script_component.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/markers/script_component.hpp b/addons/markers/script_component.hpp index 7a79d44568a..fdb5f1614e3 100644 --- a/addons/markers/script_component.hpp +++ b/addons/markers/script_component.hpp @@ -2,8 +2,8 @@ #define COMPONENT_BEAUTIFIED Markers #include "\z\ace\addons\main\script_mod.hpp" -#define DEBUG_MODE_FULL -#define DISABLE_COMPILE_CACHE +// #define DEBUG_MODE_FULL +// #define DISABLE_COMPILE_CACHE // #define ENABLE_PERFORMANCE_COUNTERS #ifdef DEBUG_ENABLED_MARKERS