Merge pull request #6703 from acemod/fix-moving-marker-synch

fix moved markers not synched
This commit is contained in:
commy2 2018-11-25 15:16:44 +01:00 committed by GitHub
commit a89dfccfb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;