Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA …

…into refactor-wield

src/activity_actor.cpp

@@ -5424,7 +5424,10 @@ void reload_activity_actor::finish( player_activity &act, Character &who )
     switch( reload_query.ret ) {
         case 1:
             // This case is only reachable if wield_check is true
-            who.wield( target_loc );
+
+            if( who.wield( target_loc ) ) {
+                loc.remove_item();
+            }
             add_msg( m_neutral, _( "The %s no longer fits in your inventory so you wield it instead." ),
                      reloadable_name );
             break;

src/npc.cpp

@@ -1516,7 +1516,9 @@ void npc::stow_item( item &it )
 // TODO: implement npc specific calls
 // bool npc::wield( item &it )
 // {
-//     // TODO: also move to item_location
+//     const map &here = get_map();
+
+// TODO: also move to item_location
 //     // sanity check: exit early if we're trying to wield the current weapon
 //     // needed for ranged_balance_test
 //     if( is_wielding( it ) ) {
@@ -1555,7 +1557,7 @@ void npc::stow_item( item &it )
 //     cata::event e = cata::event::make<event_type::character_wields_item>( getID(), weapon->typeId() );
 //     get_event_bus().send_with_talker( this, &weapon, e );
 
-//     if( get_player_view().sees( pos_bub() ) ) {
+//     if( get_player_view().sees( here, pos_bub( here ) ) ) {
 //         add_msg_if_npc( m_info, _( "<npcname> wields a %s." ),  weapon->tname() );
 //     }
 //     invalidate_range_cache();