Skip to content

Commit

Permalink
Remember charges.first and charges.second can be individually set
Browse files Browse the repository at this point in the history
  • Loading branch information
Procyonae committed Jun 12, 2024
1 parent cd801ff commit 443c972
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/item_group.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -494,9 +494,10 @@ std::map<const itype *, std::pair<int, int>> Single_item_creator::every_item_min
case S_ITEM: {
auto i = item::find_type( itype_id( id ) );

Check failure on line 495 in src/item_group.cpp

View workflow job for this annotation

GitHub Actions / build (src)

Avoid auto in declaration of 'i'. [cata-almost-never-auto,-warnings-as-errors]

Check failure on line 495 in src/item_group.cpp

View workflow job for this annotation

GitHub Actions / build (src)

'auto i' can be declared as 'const auto *i' [readability-qualified-auto,-warnings-as-errors]
if( i->count_by_charges() ) {
// TODO: Not technically perfect for only charge_min/charge max and for ammo/liquids but Item_modifier::modify()'s logic is gross and I'd rather not try to replicate it perfectly as is
const int min_charges = modifier->charges.first == -1 ?
i->charges_default() : modifier->charges.first;
const int max_charges = modifier->charges.first == -1 ?
const int max_charges = modifier->charges.second == -1 ?
i->charges_default() : modifier->charges.second;
return { std::make_pair( i, std::make_pair( modifier->count.first * min_charges, modifier->count.second * max_charges ) ) };
}
Expand Down

0 comments on commit 443c972

Please sign in to comment.