summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.h
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-10 14:20:47 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-10 14:20:47 +0000
commit5bea4d013197ca276fbeb267ac9fc3fd2f37450c (patch)
tree6ed6964b76143cadafe5f8d5003fc9ed587d1ba3 /crawl-ref/source/fight.h
parent56367110a570d3cd9e50e5dbcd55c936c9208080 (diff)
downloadcrawl-ref-5bea4d013197ca276fbeb267ac9fc3fd2f37450c.tar.gz
crawl-ref-5bea4d013197ca276fbeb267ac9fc3fd2f37450c.zip
More resist fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3242 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.h')
-rw-r--r--crawl-ref/source/fight.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h
index 1a62c70b41..b61478a058 100644
--- a/crawl-ref/source/fight.h
+++ b/crawl-ref/source/fight.h
@@ -36,8 +36,8 @@ struct mon_attack_def;
* *********************************************************************** */
int effective_stat_bonus( int wepType = -1 );
-int resist_adjust_damage(actor *defender, int res, int rawdamage,
- bool ranged = false);
+int resist_adjust_damage(actor *defender, beam_type flavour,
+ int res, int rawdamage, bool ranged = false);
// added Sept 18, 2000 -- bwr
/* ***********************************************************************
@@ -166,7 +166,9 @@ private:
bool attack_shield_blocked(bool verbose);
bool apply_damage_brand();
- void calc_elemental_brand_damage(int res, const char *verb);
+ void calc_elemental_brand_damage(beam_type flavour,
+ int res,
+ const char *verb);
int fire_res_apply_cerebov_downgrade(int res);
void drain_defender();
void drain_player();