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

Modernize pickupAction function #654

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Modernize pickupAction function #654

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7857e6f
Modernize pickupAction function
DarkWiiPlayer May 1, 2020
15b49ce
Switch single tab to 4 spaces
DarkWiiPlayer May 1, 2020
685ff24
Remove logging, check for "items" to be an array and fix oversight
DarkWiiPlayer May 1, 2020
08d1ac0
Update life_server/Functions/Actions/fn_pickupAction.sqf
DarkWiiPlayer May 1, 2020
7cf3f15
Update life_server/Functions/Actions/fn_pickupAction.sqf
DarkWiiPlayer May 1, 2020
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
23 changes: 11 additions & 12 deletions life_server/Functions/Actions/fn_pickupAction.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,22 @@
/*
File: fn_pickupAction.sqf
Author: Bryan "Tonic" Boardwine

Description:
Validates that the cash is not a lie
*/
params [
["_obj",objNull,[objNull]],
["_client",objNull,[objNull]],
["_cash",false,[true]]
];
private _target = param [0, objNull, [objNull]];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private _target = param [0, objNull, [objNull]];
params [
["_target", objNull, [objNull]]
];


if (!isRemoteExecuted) exitWith { ["Not remote executed"] call BIS_fnc_error };
if (isNull _obj) exitWith { ["Target object is NULL"] call BIS_fnc_error };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_obj not defined -> you renamed it to _target

carries on throughout the file

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't know if there's a real reason, but I don't think Altis Life uses this function, so we shouldn't start doing so now for consistencies sake


if (isNull _obj || {isNull _client}) exitWith {systemChat "Obj or client is null?";}; //No.
if (!(_obj getVariable ["inUse",false])) exitWith {
DarkWiiPlayer marked this conversation as resolved.
Show resolved Hide resolved
_client = owner _client;
_obj setVariable ["inUse",true,true];
if (_cash) then {
_obj remoteExecCall ["life_fnc_pickupMoney",_client];

if (_target getVariable "item" select 0 isEqualTo "cash") then {
Copy link
Contributor

@blackfisch blackfisch May 1, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check for "item" variable to be nil -> could theoretically happen. Better safe than sorry

_obj remoteExecCall ["life_fnc_pickupMoney", remoteExecutedOwner];
} else {
_obj remoteExecCall ["life_fnc_pickupItem",_client];
_obj remoteExecCall ["life_fnc_pickupItem", remoteExecutedOwner];
};
};
} else {
[ "Attempt to pick up money twice!" ] call BIS_fnc_error;
};