Fix UPS guns for multiple ammotype support #31442
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This patch seems to me to work in a quick test (and gets master working with Aftershock and Crazy Cataclysm again), but (a) I have no familiarity with this portion of the code, and (b) watching the changelogs, the design of things related to charges seem to be in flux at the moment. I'd appreciate a glance from someone familiar with how vehicle weapons ought to work (@ymber, if you're handy?). Thanks. |
src/veh_type.cpp
Outdated
| @@ -1061,7 +1061,9 @@ void vehicle_prototype::finalize() | |||
| } | |||
| } | |||
| if( pt.ammo_types.empty() ) { | |||
| pt.ammo_types.insert( ammotype( *base->gun->ammo.begin() )->default_ammotype() ); | |||
| if (!base->gun->ammo.empty()) { | |||
There was a problem hiding this comment.
Suggested change
| if (!base->gun->ammo.empty()) { | |
| if( !base->gun->ammo.empty() ) { |
Recent support for multiple ammotypes broke UPS guns, as they have no ammotype. Fix.
mark7
force-pushed
the
wb-fix-ups-guns-multi-ammotype
branch
from
47ed86d to
9f6e052
Compare
ZhilkinSerg
added
<Bugfix>
ghost
mentioned this pull request
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Recent support for multiple ammotypes broke UPS guns, as they have no
ammotype. Fix.
Summary
SUMMARY: Bugfixes "Fix electrically-powered vehicle guns broken by multiple ammotype support"
Purpose of change
Fixes #31399
Recent support added for multiple ammotypes in hashref 64516a6 had caused character creation to bail out when using mods containing electrically-powered vehicle weapons with no ammotype. This included CrazyCataclysm and Aftershock.
Describe the solution
Doesn't insert ammo into guns that have no ammotype.