From 795d91157c2388fa481dd6341251a7f79a44bdd8 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Thu, 17 Dec 2009 10:08:26 +0100 Subject: A different fix to --more-- overwriting the last line. This should remove the current abundance of more prompts. --- crawl-ref/source/message.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source/message.cc') diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index 838683b776..d0fc3e7e9f 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -712,7 +712,7 @@ static void mpr_store_messages(const std::string& message, // Prompt lines are presumably shown to / seen by the player accompanied // by a request for input, which should do the equivalent of a more(); to // save annoyance, don't bump New_Message_Count for prompts. - if (channel != MSGCH_PROMPT) + if (channel != MSGCH_PROMPT || New_Message_Count > 0) New_Message_Count++; Message_Line++; @@ -1077,11 +1077,7 @@ void more(bool user_forced) int keypress = 0; - int line = crawl_view.msgsz.y - 1; - - // Force scroll. - if (Options.delay_message_clear) - line++; + int line = std::max(Message_Line, crawl_view.msgsz.y - 1); if (Tutorial.tutorial_left) { -- cgit v1.2.3-54-g00ecf