diff options
| author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2010-01-11 12:31:58 +0530 |
|---|---|---|
| committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2010-01-11 12:31:58 +0530 |
| commit | cacdc4a68146726b069be133d42dd40b4be5185d (patch) | |
| tree | 1b90b0ad214ad0c522206a3761ecebaf9e9783b9 /crawl-ref/source/fight.cc | |
| parent | 0879f0bf6cdbb83fa2e35a42bbb4b2e227ef354f (diff) | |
| download | crawl-ref-cacdc4a68146726b069be133d42dd40b4be5185d.tar.gz crawl-ref-cacdc4a68146726b069be133d42dd40b4be5185d.zip | |
Disallow intrinsic reaching attacks (turtles) from reach-attacking at full diagonals (2,2).
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 1b7e53e9fd..ef9f525e0f 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -5821,6 +5821,16 @@ static void mons_lose_attack_energy(monsters *attacker, int wpn_speed, } } +bool monster_attack_actor(monsters *attacker, actor *defender, + bool allow_unarmed) +{ + ASSERT(defender == &you || defender->atype() == ACT_MONSTER); + return (defender->atype() == ACT_PLAYER ? + monster_attack(attacker, allow_unarmed) + : monsters_fight(attacker, dynamic_cast<monsters*>(defender), + allow_unarmed)); +} + // A monster attacking the player. bool monster_attack(monsters* attacker, bool allow_unarmed) { |