Avoid a beholder/fearmonger crash (#6547)

When removing the last beholder or fearmonger, we could print a message
before setting DUR_MESMERISED|AFRAID to zero.  If that triggered a
redraw of the status area, the inconsistent state would trigger an
assertion.

Now quietly remove the status before messaging about losing the
beholder.

1 files changed, 12 insertions, 4 deletions

diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc
index bf3db22e2c..403f560aed 100644
--- a/crawl-ref/source/behold.cc
+++ b/crawl-ref/source/behold.cc
@@ -211,6 +211,11 @@ void player::update_beholders()
         {
             beholders.erase(beholders.begin() + i);
             removed = true;
+
+            // If that was the last one, clear the duration before
+            // printing any subsequent messages, or a --more-- can
+            // crash (#6547).
+            _removed_beholder(true);
             _removed_beholder_msg(mon);
         }
     }
@@ -235,14 +240,17 @@ void player::update_beholder(const monster* mon)
 
 // Helper function that resets the duration and messages if the player
 // is no longer mesmerised.
-void player::_removed_beholder()
+void player::_removed_beholder(bool quiet)
 {
     if (beholders.empty())
     {
         duration[DUR_MESMERISED] = 0;
-        mprf(MSGCH_DURATION,
-             coinflip() ? "You break out of your daze!"
-                        : "You are no longer entranced.");
+        if (!quiet)
+        {
+            mprf(MSGCH_DURATION,
+                 coinflip() ? "You break out of your daze!"
+                            : "You are no longer entranced.");
+        }
     }
 }