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] Resolve Logistics Vehicle Group-Based Access #182

Merged
merged 6 commits into from
Aug 14, 2023
Merged

[Fix] Resolve Logistics Vehicle Group-Based Access #182

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
985fad1
Update fn_canPlayerUseLogi.sqf
dgibso29 Aug 14, 2023
d32d662
Update fn_canPlayerUseLogi.sqf
dgibso29 Aug 14, 2023
63f2037
Merge branch 'bugfix/logi_vic_group_access' of https://github.com/Com…
dgibso29 Aug 14, 2023
d48bbdc
Updated logic to be more understandable.
dgibso29 Aug 14, 2023
57a0feb
Updated logic to be more understandable.
dgibso29 Aug 14, 2023
455655d
Merge branch 'bugfix/logi_vic_group_access' of https://github.com/Com…
dgibso29 Aug 14, 2023
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
12 changes: 7 additions & 5 deletions components/logiVehicle/fn_canPlayerUseLogi.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,25 @@ private _logiType = GET_LOGITYPE(_logiVic);

if (_logiType isEqualTo "") exitWith {false};

private _failedCheck = false;
// Default to true for a more pleasurable code reading experience
private _passedCheck = true;
Comment on lines +23 to +24
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Inverted the logic to make it easier to understand. Defaults to true. If they have role access -- great, still true, we break out true. If not, _passedCheck turns false and we move on the the group access check. Finally, we return the value of that check.

private _roles = GET_ROLES_DYNAMIC(_logiType);

if (_roles isNotEqualTo []) then
{
private _playerRole = toLower (_player getVariable ["f_var_assignGear", ""]);
_failedCheck = !(_playerRole in _roles);
_passedCheck = (_playerRole in _roles);
};

if (_failedCheck) exitWith {false};
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Rare @Bubbus skill issue

// Break out if check passed
if (_passedCheck) exitWith {true};

private _groups = GET_GROUPS_DYNAMIC(_logiType);

if (_groups isNotEqualTo []) then
{
private _playerGroup = toLower (groupId group _player);
_failedCheck = !(_playerGroup in _groups);
_passedCheck = (_playerGroup in _groups);
};

(!_failedCheck)
(_passedCheck)