diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-22 08:41:20 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-22 08:41:20 +0000 |
| commit | 1d0f57cbceb778139ca215cc4fcfd1584951f6dd (patch) | |
| tree | cafd60c944c51fcce778aa5d6912bc548c518339 /crawl-ref/source/fight.h | |
| parent | 6f5e187a9e5cd348296dba2fd89d2e206e775a01 (diff) | |
| download | crawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.tar.gz crawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.zip | |
Merged stone_soup r15:451 into trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@452 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.h')
| -rw-r--r-- | crawl-ref/source/fight.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h index 10515868c6..fb6a1a812b 100644 --- a/crawl-ref/source/fight.h +++ b/crawl-ref/source/fight.h @@ -3,6 +3,8 @@ * Summary: Functions used during combat. * Written by: Linley Henzell * + * Modified for Crawl Reference by $Author$ on $Date$ + * * Change History (most recent first): * * <1> -/--/-- LRH Created @@ -32,7 +34,7 @@ int weapon_str_weight( int wpn_class, int wpn_type ); /* *********************************************************************** * called from: acr - it_use3 * *********************************************************************** */ -void you_attack(int monster_attacked, bool unarmed_attacks); +bool you_attack(int monster_attacked, bool unarmed_attacks); // last updated: 08jun2000 {dlb} @@ -48,5 +50,9 @@ void monster_attack(int monster_attacking); * *********************************************************************** */ bool monsters_fight(int monster_attacking, int monster_attacked); +int calc_your_to_hit( int heavy_armour, bool hand_and_a_half_bonus, + bool water_attack, bool random_factor ); + +int calc_heavy_armour_penalty( bool random_factor ); #endif |