diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-11 14:54:52 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-11 14:58:06 -0400 |
| commit | c95cc8db36bdf7730dbbc3739bc658c05f9dafc2 (patch) | |
| tree | 161af4209da36bcd4017c8d4ef565acb6b8d41ab /crawl-ref/source/actor.h | |
| parent | 81d8d5f10c0a4391e4b34f73ed6ba70efa1684a3 (diff) | |
| download | crawl-ref-c95cc8db36bdf7730dbbc3739bc658c05f9dafc2.tar.gz crawl-ref-c95cc8db36bdf7730dbbc3739bc658c05f9dafc2.zip | |
Clean up holy attacks slightly (#6071).
Mostly this just merges res_holy_energy and res_holy_flames, keeping
Djinn's special-case immunity to the latter but not the former. The only
gameplay change should be that (a) demons will take slightly more damage
from holy flames and (b) distracted monsters will be immune to them.
Diffstat (limited to 'crawl-ref/source/actor.h')
| -rw-r--r-- | crawl-ref/source/actor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crawl-ref/source/actor.h b/crawl-ref/source/actor.h index 73186a6fb4..57d61dead7 100644 --- a/crawl-ref/source/actor.h +++ b/crawl-ref/source/actor.h @@ -280,7 +280,6 @@ public: virtual bool is_insubstantial() const = 0; virtual int res_acid(bool calc_unid = true) const = 0; virtual int res_fire() const = 0; - virtual int res_holy_fire() const; virtual int res_steam() const = 0; virtual int res_cold() const = 0; virtual int res_elec() const = 0; |