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

Common - Use CBA addons instead of activatedAddons #6802

Merged
merged 5 commits into from
Feb 14, 2019

Conversation

dedmen
Copy link
Contributor

@dedmen dedmen commented Feb 9, 2019

@commy2
Copy link
Contributor

commy2 commented Feb 9, 2019

Does this break anything due to case sensitivity?

@dedmen
Copy link
Contributor Author

dedmen commented Feb 9, 2019

We look for a3_ I think it's A3_

@dedmen
Copy link
Contributor Author

dedmen commented Feb 9, 2019

Yes. cba_common_addons -> A3_Functions_F

Also find a3_ is kinda bad. Shouldn't we just select the first 3 characters and compare if it's a3_ or ace?

@dedmen
Copy link
Contributor Author

dedmen commented Feb 9, 2019

How about this?

@PabstMirror PabstMirror changed the title Use CBA addons instead of activatedAddons Common - Use CBA addons instead of activatedAddons Feb 10, 2019
@PabstMirror PabstMirror added this to the 3.13.0 milestone Feb 10, 2019
@PabstMirror PabstMirror added kind/enhancement Release Notes: **IMPROVED:** impact/trivial kind/optimization Release Notes: **IMPROVED:** and removed impact/trivial kind/enhancement Release Notes: **IMPROVED:** labels Feb 10, 2019
@dedmen
Copy link
Contributor Author

dedmen commented Feb 14, 2019

Thanks for making commy happy

} forEach activatedAddons;
private _aceWhitelist = missionNamespace getVariable ["ACE_Version_Whitelist", []];
private _files = CBA_common_addons select {
(_x select [0,3] != "a3_") &&
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
(_x select [0,3] != "a3_") &&
_x select [0,3] != "a3_" &&

private _files = CBA_common_addons select {
(_x select [0,3] != "a3_") &&
{_x select [0,4] != "ace_"} &&
{!((toLower _x) in _aceWhitelist)}
Copy link
Contributor

@commy2 commy2 Feb 14, 2019

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.

@commy2
Copy link
Contributor

commy2 commented Feb 14, 2019

Not so fast.

@PabstMirror PabstMirror merged commit 598738c into acemod:master Feb 14, 2019
@PabstMirror
Copy link
Contributor

I accidentally merged it before we could apply those changes

@commy2
Copy link
Contributor

commy2 commented Feb 14, 2019

boo

@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.6 Feb 23, 2019
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
* Use CBA addons instead of activatedAddons

* Better checks

* Betterest checks

* Delay call to toLower until needed

* Apply suggestions from code review

Co-Authored-By: dedmen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/optimization Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants