From 5c061029d1c6edea3a7d27d079fc44d002166d7e Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sat, 26 Apr 2008 12:49:14 +0000 Subject: Remove Beogh recalling orcs for you, and instead try harder to find existing followers on the level (with decreasing chances) to bless them. This lowers probability of the reinforcement effect from 10% to 2.5% if bless_follower() is called without any parameters in the first place. Greatly reduce chances for orcs talking, and tidy up monspeak.txt a bit to make comparing chances easier. Add the promised friendly pickup toggle (command on Ctrl-T), and a new option for its default value. Modify documentation accordingly. Fix 1947256: hunger state not shown at game reload. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4662 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/items.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/items.cc') diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index f2c89cd3e6..66823ea7c1 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -931,10 +931,8 @@ void origin_acquired(item_def &item, int agent) void origin_set_inventory(void (*oset)(item_def &item)) { for (int i = 0; i < ENDOFPACK; ++i) - { if (is_valid_item(you.inv[i])) oset(you.inv[i]); - } } static int first_corpse_monnum(int x, int y) @@ -1582,6 +1580,8 @@ int move_item_to_player( int obj, int quant_got, bool quiet ) item.x = -1; item.y = -1; item.link = freeslot; + // remove "dropped by ally" flag + item.flags &= ~(ISFLAG_DROPPED_BY_ALLY); if (!item.slot) item.slot = index_to_letter(item.link); -- cgit v1.2.3-54-g00ecf