Energy remaining now looks for battery ammo_types

John-Candlebury · John-Candlebury · commit d0324d9023c0 · 2025-08-23T15:23:01.000-06:00
diff --git a/src/item.cpp b/src/item.cpp
@@ -11504,7 +11504,7 @@ units::energy item::energy_remaining( const Character *carrier, bool ignoreExter
     if( is_magazine() ) {
         ret += energy;
         for( const item *e : contents.all_items_top( pocket_type::MAGAZINE ) ) {
-            if( e->typeId() == itype_battery ) {
+            if( e->ammo_type() == ammo_battery ) {
                 ret += units::from_kilojoule( static_cast<std::int64_t>( e->charges ) );
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -11504,7 +11504,7 @@ units::energy item::energy_remaining( const Character *carrier, bool ignoreExter`
`11504`	`11504`	`if( is_magazine() ) {`
`11505`	`11505`	`ret += energy;`
`11506`	`11506`	`for( const item *e : contents.all_items_top( pocket_type::MAGAZINE ) ) {`
`11507`		`- if( e->typeId() == itype_battery ) {`
	`11507`	`+ if( e->ammo_type() == ammo_battery ) {`
`11508`	`11508`	`ret += units::from_kilojoule( static_cast<std::int64_t>( e->charges ) );`
`11509`	`11509`	`}`
`11510`	`11510`	`}`