diff options
| author | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2010-01-12 19:54:24 +0100 |
|---|---|---|
| committer | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2010-01-12 19:54:24 +0100 |
| commit | 25634a7027616358c3b5ba94e478d4d641a03196 (patch) | |
| tree | 50d5aad020c35f1d09d371b089bc58c85f844784 /crawl-ref | |
| parent | 1767660614a67312a647dc709ee4a96096e35ef7 (diff) | |
| download | crawl-ref-25634a7027616358c3b5ba94e478d4d641a03196.tar.gz crawl-ref-25634a7027616358c3b5ba94e478d4d641a03196.zip | |
Add new killer_type KILL_MISCAST whose clouds don't autoexclude.
Not to be confused with KILL_MISC, which is used, among other for
the flamethrower vaults.
Aside from spell miscasts, KILL_MISCAST also applies to Zot traps
and Xom effects.
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/cloud.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 3 | ||||
| -rw-r--r-- | crawl-ref/source/spl-mis.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc index 50e27a3fd2..60cde0db60 100644 --- a/crawl-ref/source/cloud.cc +++ b/crawl-ref/source/cloud.cc @@ -67,7 +67,8 @@ static bool _killer_whose_match(kill_category whose, killer_type killer) return (killer == KILL_MON_MISSILE || killer == KILL_YOU_CONF); case KC_OTHER: - return (killer == KILL_MON_MISSILE || killer == KILL_MISC); + return (killer == KILL_MON_MISSILE || killer == KILL_MISCAST + || killer == KILL_MISC); case KC_NCATEGORIES: ASSERT(false); diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 622cee97ad..d95cbc0b72 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1499,7 +1499,8 @@ enum killer_type // monster_die(), thing_thrown KILL_YOU_MISSILE, KILL_MON_MISSILE, KILL_YOU_CONF, - KILL_MISC, // 5 + KILL_MISCAST, // 5 + KILL_MISC, // miscellany KILL_RESET, // abjuration, etc. KILL_DISMISSED // only on new game startup }; diff --git a/crawl-ref/source/spl-mis.cc b/crawl-ref/source/spl-mis.cc index 6fa022880c..0e98233ab7 100644 --- a/crawl-ref/source/spl-mis.cc +++ b/crawl-ref/source/spl-mis.cc @@ -194,7 +194,7 @@ void MiscastEffect::init() act_source = target; kc = KC_OTHER; - kt = KILL_MISC; + kt = KILL_MISCAST; if (source == ZOT_TRAP_MISCAST) { |