Make extra-sure that a monster won't be announced to have come into view, only

to immediately move out of view, by introducing the notion of the currently
acting monster to crawl_state, and only flushing out the "comes into view"
message in mpr() for the currently acting monster.  Not sure if it's worth it
just for the sake of avoiding doing a "has this monster just now come into
view" check in every place that a monster might issue a message, but at least
this way we won't miss any places such a check should be placed.


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

1 files changed, 7 insertions, 3 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 88cec101ae..835615e60e 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1499,6 +1499,8 @@ static void _center_cursor()
 //
 static void _input()
 {
+    crawl_state.clear_mon_acting();
+
     religion_turn_start();
     check_beholders();
 
@@ -3113,12 +3115,14 @@ static void _check_sanctuary()
 
 void world_reacts()
 {
-    you.turn_is_over = true;
+    crawl_state.clear_mon_acting();
 
     if (!crawl_state.arena)
+    {
+        you.turn_is_over = true;
         religion_turn_end();
-
-    crawl_state.clear_god_acting();
+        crawl_state.clear_god_acting();
+    }
 
 #ifdef USE_TILE
     tiles.clear_text_tags(TAG_TUTORIAL);