Fix merge conflicts

This commit is contained in:
Vdauphin 2021-08-03 22:43:42 +02:00
parent 460b5fa453
commit 07f3a5f216

View File

@ -52,6 +52,9 @@ if (_object isEqualType objNull) then {
} else { } else {
_object = createVehicle [_item, _posAGL, [], 0, "NONE"]; _object = createVehicle [_item, _posAGL, [], 0, "NONE"];
_object setPosASL (AGLtoASL _posAGL); _object setPosASL (AGLtoASL _posAGL);
[QEGVAR(common,fixCollision), _object] call CBA_fnc_localEvent;
[QEGVAR(common,fixPosition), _object] call CBA_fnc_localEvent;
}; };
_object _object