diff --git a/src/pickup.cpp b/src/pickup.cpp index 288ea626d3f7b..37f6083cc1ea0 100644 --- a/src/pickup.cpp +++ b/src/pickup.cpp @@ -858,12 +858,6 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from ) wprintw( w_pickup, " - " ); } std::string item_name; - std::string stolen; - bool stealing = false; - if( !this_item.is_owned_by( g->u, true ) ) { - stolen = "!"; - stealing = true; - } if( stacked_here[true_it].front()->is_money() ) { //Count charges // TODO: transition to the item_location system used for the inventory @@ -882,38 +876,25 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from ) it != stacked_here[true_it].end() && c > 0; ++it, --c ) { charges += ( *it )->charges; } - if( stealing ) { - item_name = string_format( "%s %s", stolen, - stacked_here[true_it].front()->display_money( getitem[true_it].count, charges_total, charges ) ); - } else { - item_name = stacked_here[true_it].front()->display_money( getitem[true_it].count, charges_total, - charges ); - } + item_name = stacked_here[true_it].front()->display_money( getitem[true_it].count, charges_total, + charges ); } } else { - if( stealing ) { - item_name = string_format( "%s %s", stolen, - this_item.display_name( stacked_here[true_it].size() ) ); - } else { - item_name = this_item.display_name( stacked_here[true_it].size() ); - } + item_name = this_item.display_name( stacked_here[true_it].size() ); } if( stacked_here[true_it].size() > 1 ) { - if( stealing ) { - item_name = string_format( "%s %d %s", stolen, stacked_here[true_it].size(), item_name ); - } else { - item_name = string_format( "%d %s", stacked_here[true_it].size(), item_name ); - } + item_name = string_format( "%d %s", stacked_here[true_it].size(), item_name ); } if( get_option( "ITEM_SYMBOLS" ) ) { - if( stealing ) { - item_name = string_format( "%s %s %s", stolen, this_item.symbol().c_str(), - item_name.c_str() ); - } else { - item_name = string_format( "%s %s", this_item.symbol().c_str(), - item_name ); - } + item_name = string_format( "%s %s", this_item.symbol().c_str(), + item_name ); + } + + // if the item does not belong to your fraction then add the stolen symbol + if( !this_item.is_owned_by( g->u, true ) ) { + item_name = string_format( "! %s", item_name ); } + trim_and_print( w_pickup, point( 6, 1 + ( cur_it % maxitems ) ), pickupW - 4, icolor, item_name ); }