mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Fix merge conflicts
This commit is contained in:
parent
460b5fa453
commit
07f3a5f216
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user