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

Use correct TransportX type for ace items #5168

Merged
merged 2 commits into from
May 18, 2017
Merged

Conversation

PabstMirror
Copy link
Contributor

Fix #5068

As far as I can tell arma can handle the wrong entries.
This does seem to put he mine detectors at the top of the "misc items" box, but I noticed no other changes.

@PabstMirror PabstMirror added this to the 3.10.0 milestone May 17, 2017
MACRO_ADDITEM(ACE_HandFlare_Red,12);
MACRO_ADDITEM(ACE_M84,12);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_HandFlare_White,12);
Copy link
Member

Choose a reason for hiding this comment

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

Were these intentionally changed to white and green?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No I had just copied the top set, thanks for catching

MACRO_ADDITEM(ACE_HandFlare_Green,12);
MACRO_ADDITEM(ACE_M84,12);
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_HandFlare_White,12);
Copy link
Member

Choose a reason for hiding this comment

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

Similar here

@commy2
Copy link
Contributor

commy2 commented May 17, 2017

lgtm, but what was the point again?

@PabstMirror
Copy link
Contributor Author

I dunno, #5068 said it broke a script

@kymckay
Copy link
Member

kymckay commented May 17, 2017

Think it's for consistency with vanilla

@PabstMirror PabstMirror merged commit cd5dcf5 into master May 18, 2017
@PabstMirror PabstMirror deleted the cargoTransportType branch May 18, 2017 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants