Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dragging - Fix dragging/carrying failing for items in ViV #10128

Merged
merged 3 commits into from
Jul 20, 2024
Merged

Dragging - Fix dragging/carrying failing for items in ViV #10128

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7123b60
Unload ViV before dragging/carrying
johnb432 Jul 19, 2024
b9d8c7b
Update addons/dragging/functions/fnc_carryObject.sqf
johnb432 Jul 20, 2024
edebac5
Use lazy eval to check if item was unloaded
johnb432 Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions addons/dragging/functions/fnc_carryObject.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
params ["_unit", "_target"];
TRACE_2("params",_unit,_target);

// If in ViV cargo, unload it first
if (!isNull isVehicleCargo _target) then {
objNull setVehicleCargo _target;
johnb432 marked this conversation as resolved.
Show resolved Hide resolved
};

// Get attachTo offset and direction
private _position = _target getVariable [QGVAR(carryPosition), [0, 0, 0]];
private _direction = _target getVariable [QGVAR(carryDirection), 0];
Expand Down
5 changes: 5 additions & 0 deletions addons/dragging/functions/fnc_dragObject.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
params ["_unit", "_target"];
TRACE_2("params",_unit,_target);

// If in ViV cargo, unload it first
if (!isNull isVehicleCargo _target) then {
objNull setVehicleCargo _target;
};

// Get attachTo offset and direction.
private _position = _target getVariable [QGVAR(dragPosition), [0, 0, 0]];
private _direction = _target getVariable [QGVAR(dragDirection), 0];
Expand Down