From df750a0139a6fb3bd89aa87066f29236211cd9f1 Mon Sep 17 00:00:00 2001 From: Matthew Cline Date: Fri, 13 Nov 2009 03:21:41 -0800 Subject: religion.cc: mons_make_god_gift(): switching gods mons_make_god_gift() would assert if a monster already had mon->god set to something besides GOD_NO_GOD or the god doing the gifting, but this didn't work with Jiyva slimifying orcs that worship Beogh. I think this is left over from before there was MF_GOD_GIFT, when mon->god != GOD_NO_GOD mean that the monster was a god-gift. So now instead it asserts if the monster is already a god gift. --- crawl-ref/source/religion.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'crawl-ref/source/religion.cc') diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index f29e38152e..74158c88b8 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1374,8 +1374,7 @@ void mons_make_god_gift(monsters *mon, god_type god) if (god == GOD_NO_GOD) god = acting_god; - ASSERT(acting_god == GOD_NO_GOD || god == acting_god); - ASSERT(mon->god == GOD_NO_GOD || mon->god == god); + ASSERT(!(mon->flags & MF_GOD_GIFT)); mon->god = god; -- cgit v1.2.3-54-g00ecf