summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-05 10:02:51 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-05 10:02:51 +0000
commitf68c2c0bdf87a83cd543e7addd4b9511ea226081 (patch)
tree6ae6543fe080a9f4615338c897c959c3c2053d70
parent22c92033c028930a987503953731a630b817c4f0 (diff)
downloadcrawl-ref-f68c2c0bdf87a83cd543e7addd4b9511ea226081.tar.gz
crawl-ref-f68c2c0bdf87a83cd543e7addd4b9511ea226081.zip
monsters::pickup_item() treats friendlies no differently than hostiles during
arena mode. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8242 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/mon-util.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index bc8f26dec0..0318073ef4 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -4845,7 +4845,7 @@ bool monsters::pickup_item(item_def &item, int near, bool force)
return (false);
}
- if (mons_friendly(this))
+ if (mons_friendly(this) && !crawl_state.arena)
{
// Never pick up gold or misc. items, it'd only annoy the player.
if (itype == OBJ_MISCELLANY || itype == OBJ_GOLD)