summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilesdl.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-06 01:37:30 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-06 01:37:30 +0000
commitb047730f0c88df6ab5d53aac6470a47aae2a7af3 (patch)
tree77f59865f0ce7a9c089101fb9ca752111d7aed15 /crawl-ref/source/tilesdl.cc
parentd91b7c79b321690ca48ec952cd6012b419eb3c03 (diff)
downloadcrawl-ref-b047730f0c88df6ab5d53aac6470a47aae2a7af3.tar.gz
crawl-ref-b047730f0c88df6ab5d53aac6470a47aae2a7af3.zip
In arena mode, make mons_friendly() and mons_wont_attack() always return false,
with mons_friendly_real() and monst_wont_attack_real() having the old behaviour of ignoring arena mode. Remove all special casing of "mons_friendly(mon) && !crawl_state.arena", instead using mons_friendly_real() and mons_wont_attack_real() in the monster code which distinguishes friend from foe. Might be a bit buggy. Make Zot traps affect all monsters in arena mode, and never the player. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8255 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilesdl.cc')
-rw-r--r--crawl-ref/source/tilesdl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 81a2ecc863..035fa1de0d 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -1119,7 +1119,7 @@ void TilesFramework::update_minimap(int gx, int gy, map_feature f)
else if (f == MF_MONS_HOSTILE && mgrd[gx][gy] != NON_MONSTER)
{
const int grid = mgrd[gx][gy];
- if (mons_friendly(&menv[grid]))
+ if (mons_friendly_real(&menv[grid]))
f = MF_MONS_FRIENDLY;
else if (mons_neutral(&menv[grid]))
f = MF_MONS_NEUTRAL;