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

Common - Use CBA addons instead of activatedAddons #6802

Merged
merged 5 commits into from
Feb 14, 2019
Merged

Common - Use CBA addons instead of activatedAddons #6802

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f2a970
Use CBA addons instead of activatedAddons
dedmen Feb 9, 2019
75e9952
Better checks
dedmen Feb 9, 2019
d610280
Betterest checks
dedmen Feb 12, 2019
5c05c66
Delay call to toLower until needed
PabstMirror Feb 13, 2019
86d1f67
Apply suggestions from code review
jonpas Feb 14, 2019
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
13 changes: 6 additions & 7 deletions addons/common/scripts/checkVersionNumber.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
// by commy2
#include "script_component.hpp"

private _files = [];

{
if (_x find "a3_" != 0 && {_x find "ace_" != 0} && {!(toLower _x in (missionNamespace getVariable ["ACE_Version_Whitelist", []]))}) then {
_files pushBack _x;
};
} forEach activatedAddons;
private _aceWhitelist = missionNamespace getVariable ["ACE_Version_Whitelist", []];
private _files = CBA_common_addons select {
((_x select [0,3]) != "a3_") &&
dedmen marked this conversation as resolved.
Show resolved Hide resolved
{(_x select [0,4]) != "ace_"} &&
dedmen marked this conversation as resolved.
Show resolved Hide resolved
{!((toLower _x) in _aceWhitelist)}
Copy link
Contributor

@commy2 commy2 Feb 14, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
{!((toLower _x) in _aceWhitelist)}
{!(toLower _x in _aceWhitelist)}

Copy link
Member

Choose a reason for hiding this comment

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

I disagree, less readable.

};

private _versions = [];
{
Expand Down