Flush macro input buffer when fire command fails (Erik).

Allow using the special sequence \{!more} in macros to disable -more- prompts
while processing the macro expansion.

Fixed a couple of off-by-one errors in the level-map.

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

1 files changed, 17 insertions, 15 deletions

diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index a82d5ffd07..be11e734db 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -649,22 +649,24 @@ void mesclr( bool force )
 
 void more(void)
 {
-    char keypress = 0;
-
-    if (Options.tutorial_left)
-        message_out(crawl_view.msgsz.y - 1,
-                    LIGHTGREY,
-                    "--more--                        "
-                    "Press Ctrl-P to reread old messages",
-                    2, false);
-    else
-        message_out(crawl_view.msgsz.y - 1,
-                    LIGHTGREY, "--more--", 2, false);
-
-    do
-        keypress = getch();
-    while (keypress != ' ' && keypress != '\r' && keypress != '\n');
+    if (Options.show_more_prompt)
+    {
+        char keypress = 0;
+
+        if (Options.tutorial_left)
+            message_out(crawl_view.msgsz.y - 1,
+                        LIGHTGREY,
+                        "--more--                        "
+                        "Press Ctrl-P to reread old messages",
+                        2, false);
+        else
+            message_out(crawl_view.msgsz.y - 1,
+                        LIGHTGREY, "--more--", 2, false);
 
+        do
+            keypress = getch();
+        while (keypress != ' ' && keypress != '\r' && keypress != '\n');
+    }
     mesclr(true);
 }                               // end more()