Fix bug #2089989: only place friendly god gifts after the player's turn is

over, so that any in-progress effects won't hurt them, thus turning them
hostile and angering the player's god.  Also try to avoid placing god gifts
(friendly or hostile) in a damaging cloud, and if it's unavoidable and placing
a friendly god gift there would anger the god then don't place them at all.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8426 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 0 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index fb73e3728b..ca1e0e33d3 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1197,6 +1197,10 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
             formatted_mpr(formatted_string::parse_string("Not a <magenta>Wizard</magenta> Command."));
         break;
     }
+    // Force the placement of any delayed monster gifts.
+    you.turn_is_over = true;
+    religion_turn_end();
+
     you.turn_is_over = false;
 }
 
@@ -3108,6 +3112,9 @@ static void _check_sanctuary()
 
 void world_reacts()
 {
+    if (!crawl_state.arena)
+        religion_turn_end();
+
     crawl_state.clear_god_acting();
 
 #ifdef USE_TILE