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

Fix enum errors #5834

Merged
merged 5 commits into from
Dec 1, 2017
Merged

Fix enum errors #5834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd79753
Fix enum errors
commy2 Dec 1, 2017
ca3a343
Update fnc_paradropItem.sqf
commy2 Dec 1, 2017
2114b38
Update fnc_actionPlaceInBodyBag.sqf
commy2 Dec 1, 2017
947911c
Update fnc_compat_spectatorBI.sqf
commy2 Dec 1, 2017
d676475
Update ACE_ZeusActions.hpp
commy2 Dec 1, 2017
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
2 changes: 1 addition & 1 deletion addons/cargo/functions/fnc_paradropItem.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private _itemObject = if (_item isEqualType objNull) then {
[QGVAR(serverUnload), [_item, _posBehindVehicleAGL]] call CBA_fnc_serverEvent;
_item
} else {
private _newItem = createVehicle [_item, _posBehindVehicleAGL, [], 0, ""];
private _newItem = createVehicle [_item, _posBehindVehicleAGL, [], 0, "NONE"];
_newItem setPosASL (AGLtoASL _posBehindVehicleAGL);
_newItem
};
Expand Down
2 changes: 1 addition & 1 deletion addons/cargo/functions/fnc_unloadItem.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ if (_item isEqualType objNull) then {
// do both on server to ensure they are executed in the correct order
[QGVAR(serverUnload), [_item, _emptyPosAGL]] call CBA_fnc_serverEvent;
} else {
private _newItem = createVehicle [_item, _emptyPosAGL, [], 0, ""];
private _newItem = createVehicle [_item, _emptyPosAGL, [], 0, "NONE"];
_newItem setPosASL (AGLtoASL _emptyPosAGL);
};

Expand Down
2 changes: 1 addition & 1 deletion addons/interaction/ACE_ZeusActions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ACE_ZeusActions {
class remoteControl {
displayName = "$STR_A3_CfgVehicles_ModuleRemoteControl_F";
icon = "\A3\Modules_F_Curator\Data\portraitRemoteControl_ca.paa";
statement = "_unit = objNull; { if ((side _x in [east,west,resistance,civilian]) && !(isPlayer _x)) exitWith { _unit = _x; }; } forEach (curatorSelected select 0); bis_fnc_curatorObjectPlaced_mouseOver = ['OBJECT',_unit]; (group _target) createUnit ['ModuleRemoteControl_F',[0,0,0],[],0,''];";
statement = "_unit = objNull; { if ((side _x in [east,west,resistance,civilian]) && !(isPlayer _x)) exitWith { _unit = _x; }; } forEach (curatorSelected select 0); bis_fnc_curatorObjectPlaced_mouseOver = ['OBJECT',_unit]; (group _target) createUnit ['ModuleRemoteControl_F',[0,0,0],[],0,'NONE'];";
};
};

Expand Down
2 changes: 1 addition & 1 deletion addons/medical/functions/fnc_actionPlaceInBodyBag.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ private _direction = _dirVect call CBA_fnc_vectDir;
//move the body away now, so it won't physX the bodyBag object (this setPos seems to need to be called where object is local)
_target setPosASL [-5000, -5000, 0];

private _bodyBag = createVehicle ["ACE_bodyBagObject", _position, [], 0, ""];
private _bodyBag = createVehicle ["ACE_bodyBagObject", _position, [], 0, "NONE"];

// prevent body bag from flipping
_bodyBag setPosASL _position;
Expand Down
2 changes: 1 addition & 1 deletion addons/spectator/functions/fnc_compat_spectatorBI.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if (_respawn in [4,5]) then {

// Switch to a virtual unit so draw3D continues to work
private _grp = createGroup [sideLogic, true];
private _virtual = _grp createUnit [QGVAR(virtual),[0,0,0],[],0,""];
private _virtual = _grp createUnit [QGVAR(virtual),[0,0,0],[],0,"NONE"];

// Prevent unit falling into water (compatibility for some addons)
_virtual enableSimulation false;
Expand Down