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

Jump to bottom

ACC Switching - Ignore inheritance #722

Merged
merged 2 commits into from
Jul 9, 2017
Merged

ACC Switching - Ignore inheritance #722

merged 2 commits into from
Jul 9, 2017

Conversation

PabstMirror
Copy link
Contributor

@PabstMirror PabstMirror commented Jul 7, 2017 •
edited
Loading

Ref acemod/ACE3#5331

ACE does:

class acc_pointer_IR: ItemCore {
    MRT_SwitchItemNextClass = "ACE_acc_pointer_red";

RHS does:

class rhsusf_acc_anpeq15A : acc_pointer_IR {

Both are valid, but conflict.

This will make weapon switch ignored inherited values.

@PabstMirror PabstMirror added this to the 3.4.1 milestone Jul 7, 2017
@PabstMirror PabstMirror requested a review from robalo July 7, 2017 17:55
robalo
robalo reviewed Jul 7, 2017
View reviewed changes
Copy link
Contributor

@robalo robalo left a comment

Choose a reason for hiding this comment

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

!(_configs isEqualTo [])
might be faster than
(count _configs) > 0

@Killswitch00 Killswitch00 merged commit b839a4f into master Jul 9, 2017
@commy2 commy2 deleted the accSwitch-nonInheritance branch July 9, 2017 22:05
@PabstMirror PabstMirror mentioned this pull request Sep 4, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@robalo robalo robalo approved these changes

Assignees
No one assigned
Labels
Bug Fix
Projects
None yet
Milestone
3.4.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@PabstMirror @robalo @Killswitch00