@@ -916,11 +916,9 @@ bool advanced_inventory::fill_lists_with_pane_items( Character &player_character
916916 std::make_pair ( it->volume ().value (), weight_int ) :
917917 std::make_pair ( weight_int, it->volume ().value () );
918918 if ( it->is_favorite ) {
919- unsorted_fav_list.emplace_back ( std::make_pair ( sort_values,
920- drop_or_stash_item_info ( it, it->count () ) ) );
919+ unsorted_fav_list.emplace_back ( sort_values, drop_or_stash_item_info ( it, it->count () ) );
921920 } else {
922- unsorted_item_list.emplace_back ( std::make_pair ( sort_values,
923- drop_or_stash_item_info ( it, it->count () ) ) );
921+ unsorted_item_list.emplace_back ( sort_values, drop_or_stash_item_info ( it, it->count () ) );
924922 }
925923 }
926924 }
@@ -975,10 +973,10 @@ bool advanced_inventory::fill_lists_with_pane_items( Character &player_character
975973 std::sort ( std::begin ( unsorted_item_list ), std::end ( unsorted_item_list ), sort );
976974 std::sort ( std::begin ( unsorted_fav_list ), std::end ( unsorted_fav_list ), sort );
977975
978- for ( move_all_entry entry : unsorted_item_list ) {
976+ for ( const move_all_entry & entry : unsorted_item_list ) {
979977 item_list.push_back ( entry.second );
980978 }
981- for ( move_all_entry entry : unsorted_fav_list ) {
979+ for ( const move_all_entry & entry : unsorted_fav_list ) {
982980 item_list.push_back ( entry.second );
983981 }
984982 return true ;
@@ -1440,7 +1438,7 @@ void advanced_inventory::start_activity(
14401438 return ;
14411439 }
14421440 for ( item *it : target_buckets.front ()->get_contents ().all_items_top () ) {
1443- target_items.emplace_back ( item_location ( target_buckets.front (), it ) );
1441+ target_items.emplace_back ( target_buckets.front (), it );
14441442 quantities.emplace_back ( it->count () );
14451443 }
14461444 }
0 commit comments