Yet another attempt to fix problems with the monster "comes into view"

messsages.  Such messages are not not flushed immediately upon the monster
coming into view, but:

1) After world_reacts() is done.

2) When mpr() is called and the player is either delayed or repeating a
   command.

This should make sure that the "comes into view" message comes before any other
messages the monster might give, and also fix the problem of the player moving
into a monster's LOS, getting a "comes into view" message, and the monster then
moving back out of LOS during the immediately following world_reacts(), which
would leave the player puzzled as to why there's no monster in view.

As part of the change you.turn_is_over is set to true as soon as world_reacts()
starts, which might cause bugs in other places, yet some play testing indicates
that it's okay.


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

1 files changed, 4 insertions, 2 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index ebe09fae0e..88cec101ae 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1517,11 +1517,11 @@ static void _input()
         return;
     }
 
+    update_monsters_in_view();
+
     you.turn_is_over = false;
     _prep_input();
 
-    update_monsters_in_view();
-
     const bool player_feels_safe = i_feel_safe();
 
     if (Options.tutorial_left)
@@ -3113,6 +3113,8 @@ static void _check_sanctuary()
 
 void world_reacts()
 {
+    you.turn_is_over = true;
+
     if (!crawl_state.arena)
         religion_turn_end();