From e5c2d08635376bd510c1091ae6b78e69ae5dfef6 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Fri, 2 Jan 2009 06:39:14 +0000 Subject: Don't apply god conducts in monster_die() while in arena mode. In partiuclar, this prevents TSO from smiting the player when the friendly faction kills an angel or daeva. Assert in god_speaks() and did_god_conduct() if called during arena mode. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8105 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/religion.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'crawl-ref/source/religion.cc') diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index c1e1845971..37fb2258ff 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2307,6 +2307,8 @@ god_type string_to_god(const char *_name, bool exact) void god_speaks(god_type god, const char *mesg) { + ASSERT(!crawl_state.arena); + int orig_mon = mgrd(you.pos()); monsters fake_mon; @@ -2348,6 +2350,8 @@ static bool _do_god_revenge(conduct_type thing_done) bool did_god_conduct(conduct_type thing_done, int level, bool known, const monsters *victim) { + ASSERT(!crawl_state.arena); + bool retval = false; if (you.religion != GOD_NO_GOD && you.religion != GOD_XOM) -- cgit v1.2.3-54-g00ecf