diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-28 17:09:09 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-28 17:09:09 -0500 |
| commit | f05884f49be60aab15111bd5bd9c27e679b8318b (patch) | |
| tree | 9944039fa29c24a6d7db2dcba8a3ff2642bffbbf /crawl-ref/source/externs.h | |
| parent | bba212516dfeac3f4a3f4429ad0221bd10298d6d (diff) | |
| download | crawl-ref-f05884f49be60aab15111bd5bd9c27e679b8318b.tar.gz crawl-ref-f05884f49be60aab15111bd5bd9c27e679b8318b.zip | |
Attempt to make monster attacks on submerged monsters consistent with
player attacks on the same (aside from tentacle attacks, which only
monsters can currently have and which work on all submerged monsters).
Diffstat (limited to 'crawl-ref/source/externs.h')
| -rw-r--r-- | crawl-ref/source/externs.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index 3c8a6700d3..51a3c46b4c 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -1044,8 +1044,8 @@ public: size_type body_size(int psize = PSIZE_TORSO, bool base = false) const; int body_weight() const; int total_weight() const; - int damage_brand(int attk = -1); - int damage_type(int attk = -1); + int damage_brand(int which_attack = -1); + int damage_type(int which_attack = -1); int has_claws(bool allow_tran = true) const; bool has_usable_claws(bool allow_tran = true) const; item_def *weapon(int which_attack = -1); @@ -1390,8 +1390,8 @@ public: size_type body_size(int psize = PSIZE_TORSO, bool base = false) const; int body_weight() const; int total_weight() const; - int damage_brand(int attk = -1); - int damage_type(int attk = -1); + int damage_brand(int which_attack = -1); + int damage_type(int which_attack = -1); item_def *slot_item(equipment_type eq); item_def *mslot_item(mon_inv_type sl) const; @@ -1503,6 +1503,7 @@ public: bool has_spell(spell_type spell) const; bool has_attack_flavour(int flavour) const; + bool has_damage_type(int dam_type); bool can_throw_large_rocks() const; |