Merge pull request #35353 from davidpwbrown/item_dup_fix

Fix item duplication on pickup
CleverRaven · Nov 7, 2019 · f2fe3a4 · f2fe3a4
2 parents 451922f + 0e2f98c
commit f2fe3a4
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/pickup.cpp b/src/pickup.cpp
@@ -317,10 +317,7 @@ bool pick_one_up( item_location &loc, int quantity, bool &got_water, bool &offer
         case WIELD:
             if( wield_check.success() ) {
                 //using original item, possibly modifying it
-                picked_up = u.wield( it );
-                if( picked_up ) {
-                    it.charges = newit.charges;
-                }
+                picked_up = u.wield( newit );
                 if( u.weapon.invlet ) {
                     add_msg( m_info, _( "Wielding %c - %s" ), u.weapon.invlet,
                              u.weapon.display_name() );