Fix Cl fails with setting ammo of "minor wand of fireball" (CleverRav…

…en#69086) * magic_wand_error_fix * fix
anothersimulacrum · Nov 3, 2023 · 089f33e · 089f33e
1 parent 3d05762
commit 089f33e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/item_group.cpp b/src/item_group.cpp
@@ -575,8 +575,10 @@ void Item_modifier::modify( item &new_item, const std::string &context ) const
                     mag.ammo_set( mag.ammo_default(), ch );
                 }
                 new_item.put_in( mag, item_pocket::pocket_type::MAGAZINE_WELL );
-            } else if( new_item.is_magazine() || new_item.magazine_current() ) {
+            } else if( new_item.is_magazine() ) {
                 new_item.ammo_set( new_item.ammo_default(), ch );
+            } else if( new_item.magazine_current() ) {
+                new_item.ammo_set( new_item.magazine_current()->ammo_default(), ch );
             } else {
                 debugmsg( "in %s: tried to set ammo for %s which does not have ammo or a magazine",
                           context, new_item.typeId().str() );