diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-29 18:29:28 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-29 19:00:40 +0100 |
| commit | 142509155d84c040fda2d18e5d848240c17bfd72 (patch) | |
| tree | e36045a3c8977a0a2c5b8b107f5bc51befbe1a56 /crawl-ref/source/fight.cc | |
| parent | f8aaba03eab180bff3171265055b3f9409beac9c (diff) | |
| download | crawl-ref-142509155d84c040fda2d18e5d848240c17bfd72.tar.gz crawl-ref-142509155d84c040fda2d18e5d848240c17bfd72.zip | |
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.
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 1 |
1 files changed, 1 insertions, 0 deletions
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) |