From 142509155d84c040fda2d18e5d848240c17bfd72 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Thu, 29 Oct 2009 18:29:28 +0100 Subject: Remove mons_friendly special casing in arena. This was preventing _mons_check_set_foe from choosing targets in the arena. Also some checks to avoid setting MHITYOU and you.pet_target to fail triggering arena asserts. --- crawl-ref/source/fight.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'crawl-ref/source/fight.cc') diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index fc5e45d55c..7548436fbb 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -4123,6 +4123,7 @@ bool melee_attack::mons_attack_mons() // set explicitly by the player during sanctuary). if (perceived_attack && attacker->alive() && mons_friendly(defender_as_monster()) + && !crawl_state.arena && !mons_wont_attack(attacker_as_monster()) && you.pet_target == MHITNOT && env.sanctuary_time <= 0) -- cgit v1.2.3-54-g00ecf