summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.h
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/fight.h')
-rw-r--r--crawl-ref/source/fight.h35
1 files changed, 4 insertions, 31 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h
index 731430e2f5..9786a8ba7c 100644
--- a/crawl-ref/source/fight.h
+++ b/crawl-ref/source/fight.h
@@ -40,46 +40,19 @@ enum unchivalric_attack_type
struct mon_attack_def;
-// added Sept 18, 2000 -- bwr
-/* ***********************************************************************
- * called from: item_use.cc
- * *********************************************************************** */
int effective_stat_bonus( int wepType = -1 );
int resist_adjust_damage(actor *defender, beam_type flavour,
int res, int rawdamage, bool ranged = false);
-// added Sept 18, 2000 -- bwr
-/* ***********************************************************************
- * called from: describe.cc
- * *********************************************************************** */
int weapon_str_weight( object_class_type wpn_class, int wpn_type );
-
-
-// last updated: 08jun2000 {dlb}
-/* ***********************************************************************
- * called from: acr - it_use3
- * *********************************************************************** */
bool you_attack(int monster_attacked, bool unarmed_attacks);
-
-
-// last updated: 08jun2000 {dlb}
-/* ***********************************************************************
- * called from: monstuff
- * *********************************************************************** */
-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 monster_attack(monsters* attacker, bool allow_unarmed = true);
+bool monsters_fight(monsters* attacker, monsters* attacked,
bool allow_unarmed = true);
-int calc_your_to_hit( bool random_factor );
-
-int calc_heavy_armour_penalty( bool random_factor );
+int calc_your_to_hit(bool random_factor);
+int calc_heavy_armour_penalty(bool random_factor);
unchivalric_attack_type is_unchivalric_attack(const actor *attacker,
const actor *defender);