From b047730f0c88df6ab5d53aac6470a47aae2a7af3 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Tue, 6 Jan 2009 01:37:30 +0000 Subject: 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 --- crawl-ref/source/misc.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'crawl-ref/source/misc.cc') diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index a6d22b8bd2..dd5765ecf3 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -3093,6 +3093,8 @@ std::string your_hand(bool plural) bool stop_attack_prompt(const monsters *mon, bool beam_attack, bool beam_target) { + ASSERT(!crawl_state.arena); + if (you.confused() || !you.can_see(mon)) return (false); -- cgit v1.2.3-54-g00ecf