From a895c5348b0d10b79530ed85d46164e323a2ebb1 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Sun, 18 Jan 2009 09:49:47 +0000 Subject: 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 --- crawl-ref/source/directn.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/directn.cc') 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; -- cgit v1.2.3-54-g00ecf