summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/directn.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-18 09:49:47 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-18 09:49:47 +0000
commita895c5348b0d10b79530ed85d46164e323a2ebb1 (patch)
tree4dbf825b500e8b7d99c82b508cbfb3b43002599c /crawl-ref/source/directn.cc
parent3adabca6afdfb742967318d121b06c27d9845f32 (diff)
downloadcrawl-ref-a895c5348b0d10b79530ed85d46164e323a2ebb1.tar.gz
crawl-ref-a895c5348b0d10b79530ed85d46164e323a2ebb1.zip
When using the "change friendliness" wizard targetting command in arena mode,
skip the good neutrla and neutral stages in the attitude cycle. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8542 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/directn.cc')
-rw-r--r--crawl-ref/source/directn.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 5260c6f4bd..d4635d0959 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -1336,7 +1336,13 @@ void direction(dist& moves, targeting_type restricts,
{
monsters &m = menv[mid];
- switch (m.attitude)
+ mon_attitude_type att = m.attitude;
+
+ // During arena mode, skip directly from friendly to hostile.
+ if (crawl_state.arena_suspended && att == ATT_FRIENDLY)
+ att = ATT_NEUTRAL;
+
+ switch (att)
{
case ATT_FRIENDLY:
m.attitude = ATT_GOOD_NEUTRAL;