From fa1f442ef7999d3e84dadd3e9c0823ceb937dab2 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sun, 11 Oct 2009 18:11:30 -0500 Subject: Apply jpeg's patches in [2876380] (automate Xom testing) and [2876688] (new Xom effects), tweaked to fit into current trunk. --- crawl-ref/source/items.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/items.cc') diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index faf4f7168e..2e0d7a7015 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -1475,6 +1475,13 @@ static void _got_item(item_def& item, int quant) _check_note_item(item); } +void note_inscribe_item(item_def &item) +{ + _autoinscribe_item(item); + _origin_freeze(item, you.pos()); + _check_note_item(item); +} + // Returns quantity of items moved into player's inventory and -1 if // the player's inventory is full. int move_item_to_player( int obj, int quant_got, bool quiet, @@ -1637,10 +1644,7 @@ int move_item_to_player( int obj, int quant_got, bool quiet, if (!item.slot) item.slot = index_to_letter(item.link); - _autoinscribe_item( item ); - - _origin_freeze(item, you.pos()); - _check_note_item(item); + note_inscribe_item(item); item.quantity = quant_got; if (is_blood_potion(mitm[obj])) -- cgit v1.2.3-54-g00ecf