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

item: fix magazine_default for null ammo #57115

Merged
merged 1 commit into from
Apr 24, 2022
Merged

item: fix magazine_default for null ammo #57115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10349,8 +10349,8 @@ bool item::uses_magazine() const
itype_id item::magazine_default( bool conversion ) const
{
// consider modded ammo types
if( conversion && !ammo_types().empty() ) {
const itype_id ammo = ammo_default();
itype_id ammo;
if( conversion && ( ammo = ammo_default(), !ammo.is_null() ) ) {
for( const itype_id &mag : contents.magazine_compatible() ) {
auto mag_types = mag->magazine->type;
if( mag_types.find( ammo->ammo->type ) != mag_types.end() ) {
Expand Down