Merge pull request #37267 from Trioct/holster_fix

Fix item duplication through holsters
CleverRaven · Jan 24, 2020 · 40af61c · 40af61c
2 parents b0e77ba + 68b27a7
commit 40af61c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/pickup.cpp b/src/pickup.cpp
@@ -314,7 +314,10 @@ 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( newit );
+                picked_up = u.wield( it );
+                if( picked_up ) {
+                    u.weapon.charges = newit.charges;
+                }
                 if( u.weapon.invlet ) {
                     add_msg( m_info, _( "Wielding %c - %s" ), u.weapon.invlet,
                              u.weapon.display_name() );