Merge remote-tracking branch 'remotes/origin/feature/Fix-Auto-More' into develop

diff --git a/src/view/display-messages.c b/src/view/display-messages.c
index 7baae17..a6c2647 100644 (file)
--- a/src/view/display-messages.c
+++ b/src/view/display-messages.c
@@ -277,10 +277,10 @@ bool is_msg_window_flowed(void)
 static void msg_flush(player_type *player_ptr, int x)
 {
     byte a = TERM_L_BLUE;
-    bool show_more = is_msg_window_flowed();
+    bool show_more = (num_more >= 0);
 
-    if (auto_more && (quick_messages || !player_ptr->now_damaged))
-        show_more = FALSE;
+    if (auto_more && !player_ptr->now_damaged)
+        show_more = is_msg_window_flowed();
 
     player_ptr->now_damaged = FALSE;
     if (!player_ptr->playing || show_more) {