From 76d8c3651ddb1bf23d77db2e04e3c70cdec8f636 Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 19 Jan 2009 18:19:59 +0000 Subject: Fix crash with holy word scrolls. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8594 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/effects.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/effects.cc') diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 3c71f0aa31..151cf040ff 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -75,8 +75,13 @@ int holy_word_player(int pow, int caster) const char *aux = "holy word"; - if (caster < 0) + kill_method_type type = KILLED_BY_MONSTER; + if (invalid_monster_index(caster)) { + type = KILLED_BY_SOMETHING; + if (crawl_state.is_god_acting()) + type = KILLED_BY_DIVINE_WRATH; + switch (caster) { case HOLY_WORD_SCROLL: @@ -93,10 +98,7 @@ int holy_word_player(int pow, int caster) } } - ouch(hploss, caster, - (caster != HOLY_WORD_GENERIC) ? KILLED_BY_MONSTER - : KILLED_BY_SOMETHING, - aux); + ouch(hploss, caster, type, aux); return 1; } -- cgit v1.2.3-54-g00ecf