Merge pull request #31518 from ymber/type

fix capacity info for integral magazines
mythosmod · Jun 16, 2019 · 47fadd9 · 47fadd9
2 parents 1fa2eb7 + f698db0
commit 47fadd9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/item.cpp b/src/item.cpp
@@ -1441,6 +1441,12 @@ std::string item::info( std::vector<iteminfo> &info, const iteminfo_query *parts
                                        at->name() );
                         info.emplace_back( "GUN", _( "<bold>Capacity:</bold> " ), fmt, iteminfo::no_flags,
                                            mod->ammo_capacity() );
+                    } else {
+                        auto fmt = string_format(
+                                       ngettext( "<num> round of %s", "<num> rounds of %s", mod->ammo_capacity() ),
+                                       at->name() );
+                        info.emplace_back( "GUN", _( "<bold>Capacity:</bold> " ), fmt, iteminfo::no_flags,
+                                           mod->ammo_capacity() );
                     }
                 }
             }