Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix moved markers not synched

Browse Source
This commit is contained in:
commy2
2018-11-25 15:02:27 +01:00
parent a357675ad3
commit 7b8fbe10b2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addons/markers/functions/fnc_movePFH.sqf
View File

@ -22,8 +22,9 @@ if (isNull _ctrlMap || !GVAR(moving)) exitWith {
(_this select 1) call CBA_fnc_removePerFrameHandler; (_this select 1) call CBA_fnc_removePerFrameHandler;
private _finalPos = getMarkerPos _marker; 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; _marker setMarkerPosLocal _originalPos;
} else { } else {
[QGVAR(setMarkerPosLocal), [_marker, _finalPos]] call CBA_fnc_globalEvent; [QGVAR(setMarkerPosLocal), [_marker, _finalPos]] call CBA_fnc_globalEvent;

4
addons/markers/script_component.hpp
View File

@ -2,8 +2,8 @@
#define COMPONENT_BEAUTIFIED Markers #define COMPONENT_BEAUTIFIED Markers
#include "\z\ace\addons\main\script_mod.hpp" #include "\z\ace\addons\main\script_mod.hpp"
// #define DEBUG_MODE_FULL #define DEBUG_MODE_FULL
// #define DISABLE_COMPILE_CACHE #define DISABLE_COMPILE_CACHE
// #define ENABLE_PERFORMANCE_COUNTERS // #define ENABLE_PERFORMANCE_COUNTERS
#ifdef DEBUG_ENABLED_MARKERS #ifdef DEBUG_ENABLED_MARKERS