From 25634a7027616358c3b5ba94e478d4d641a03196 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Tue, 12 Jan 2010 19:54:24 +0100 Subject: 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. --- crawl-ref/source/cloud.cc | 3 ++- crawl-ref/source/enum.h | 3 ++- crawl-ref/source/spl-mis.cc | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'crawl-ref') 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) { -- cgit v1.2.3-54-g00ecf