From f442b6f700fe5e6a588c802fbcab1b5bd0097627 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 6 Jun 2008 14:43:57 +0000 Subject: 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 --- crawl-ref/source/fight.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/fight.h') 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 ); -- cgit v1.2.3-54-g00ecf