diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 14:43:57 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 14:43:57 +0000 |
| commit | f442b6f700fe5e6a588c802fbcab1b5bd0097627 (patch) | |
| tree | 7c7a85e8de26c5c1053c7b02406271b55fe5797c /crawl-ref/source/fight.h | |
| parent | 8b4814cda94ce0ba5d627b4ae572077dcf55ccda (diff) | |
| download | crawl-ref-f442b6f700fe5e6a588c802fbcab1b5bd0097627.tar.gz crawl-ref-f442b6f700fe5e6a588c802fbcab1b5bd0097627.zip | |
Fix 1986261: patrolling monsters not interrupting their patrol to hunt
the player (Whoops!)
Fix 1945669: Monsters attacking via reaching still getting secondary
unarmed attacks.
And... we're down to one page of bug reports, yay! :D
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5500 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.h')
| -rw-r--r-- | crawl-ref/source/fight.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h index 02d01c618c..7ad6255645 100644 --- a/crawl-ref/source/fight.h +++ b/crawl-ref/source/fight.h @@ -69,14 +69,15 @@ bool you_attack(int monster_attacked, bool unarmed_attacks); /* *********************************************************************** * called from: monstuff * *********************************************************************** */ -bool monster_attack(int monster_attacking); +bool monster_attack(int monster_attacking, bool allow_unarmed = true); // last updated: 08jun2000 {dlb} /* *********************************************************************** * called from: monstuff * *********************************************************************** */ -bool monsters_fight(int monster_attacking, int monster_attacked); +bool monsters_fight(int monster_attacking, int monster_attacked, + bool allow_unarmed = true); int calc_your_to_hit( bool random_factor ); |