diff options
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/ouch.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/xom.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index cb85f27986..718f0c7a7a 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -953,7 +953,7 @@ void ouch(int dam, int death_source, kill_method_type death_type, // Also don't kill wizards testing Xom acts. if ((crawl_state.repeat_cmd == CMD_WIZARD - || crawl_state.prev_cmd == CMD_WIZARD) + || crawl_state.prev_cmd == CMD_WIZARD) && you.religion != GOD_XOM) { return; @@ -962,7 +962,7 @@ void ouch(int dam, int death_source, kill_method_type death_type, // Okay, you *didn't* escape death. you.reset_escaped_death(); - // Ensure some minimal informfullness about Xom's involvment. + // Ensure some minimal information about Xom's involvment. if (aux == NULL || strlen(aux) == 0) { if (death_type != KILLED_BY_XOM) diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 39bd660f72..9f86c9368a 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -2182,5 +2182,6 @@ void xom_check_destroyed_item(const item_def& item, int cause) void xom_death_message() { - god_speaks(GOD_XOM, _get_xom_speech("laughter").c_str()); + if (you.religion == GOD_XOM) + god_speaks(GOD_XOM, _get_xom_speech("laughter").c_str()); } |