From 2bcedfdf3c59078e54d15d03b3a9473ed4bdd44b Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 23 Mar 2009 21:08:10 +0000 Subject: * Allow viewing of card descriptions from Triple Draw and Stack Deck. * Sort items in 'V' screen according to pickup menu sort order. * Name Xom's randart book gifts more randomly. * Colour items seen by 'x' with message colour tags and same for pickup messages. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9541 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/items.cc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'crawl-ref/source/items.cc') diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 566fb08874..c368440068 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -301,7 +301,7 @@ void inc_inv_item_quantity( int obj, int amount, bool suppress_burden ) you.m_quiver->on_inv_quantity_changed(obj, amount); you.inv[obj].quantity += amount; - if ( !suppress_burden ) + if (!suppress_burden) burden_change(); } @@ -1300,7 +1300,7 @@ void pickup() if (!pickup_warning.empty()) mpr(pickup_warning.c_str()); } -} // end pickup() +} bool is_stackable_item( const item_def &item ) { @@ -1615,8 +1615,10 @@ int move_item_to_player( int obj, int quant_got, bool quiet, _got_item(mitm[obj], quant_got); if (!quiet) - mpr( you.inv[m].name(DESC_INVENTORY).c_str() ); - + { + mpr(get_message_colour_tags(you.inv[m], + DESC_INVENTORY).c_str()); + } you.turn_is_over = true; return (retval); @@ -1624,7 +1626,7 @@ int move_item_to_player( int obj, int quant_got, bool quiet, } } - // can't combine, check for slot space + // Can't combine, check for slot space. if (inv_count() >= ENDOFPACK) return (-1); @@ -1681,8 +1683,10 @@ int move_item_to_player( int obj, int quant_got, bool quiet, burden_change(); if (!quiet) - mpr( you.inv[freeslot].name(DESC_INVENTORY).c_str() ); - + { + mpr(get_message_colour_tags(you.inv[freeslot], + DESC_INVENTORY).c_str()); + } if (Options.tutorial_left) { taken_new_item(item.base_type); -- cgit v1.2.3-54-g00ecf