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.

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 assignment operator return value bug for directCall #665

Merged
merged 1 commit into from
May 4, 2017
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions addons/common/fnc_directCall.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ Author:
---------------------------------------------------------------------------- */
#include "script_component.hpp"

params [["_CBA_code", {}, [{}]], ["_CBA_arguments", []]];
params [["_CBA_code", {}, [{}]], ["_this", []]];

private "_CBA_return";

isNil {
_CBA_return = _CBA_arguments call _CBA_code;
_CBA_return = [_x] apply _CBA_code select 0;
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the point of _x?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So _x doesn't become undefined in _CBA_code, but stays _x.

};

if (!isNil "_CBA_return") then {_CBA_return};