Auto-clear more while luaterp is running

3 files changed, 16 insertions, 1 deletions

diff --git a/crawl-ref/source/luaterp.cc b/crawl-ref/source/luaterp.cc
index 745cfbc12c..48093d1eb6 100644
--- a/crawl-ref/source/luaterp.cc
+++ b/crawl-ref/source/luaterp.cc
@@ -106,8 +106,12 @@ static int _report(lua_State *ls, int status)
     return status;
 }
 
+static bool _luaterp_running = false;
+
 void run_clua_interpreter(lua_State *ls)
 {
+    _luaterp_running = true;
+
     int status;
     mpr("[Hit ESC to exit interpreter.]");
     while ((status = _loadline(ls)) != -1)
@@ -127,6 +131,13 @@ void run_clua_interpreter(lua_State *ls)
         }
     }
     lua_settop(ls, 0); // clear stack
+
+    _luaterp_running = false;
+}
+
+bool luaterp_running()
+{
+    return (_luaterp_running);
 }
 
 static bool _loaded_terp_files = false;
@@ -135,6 +146,7 @@ void debug_terp_dlua()
 {
     if (!_loaded_terp_files)
     {
+        dlua.execfile("clua/debug.lua", false, false);
         for (unsigned int i = 0; i < Options.terp_files.size(); i++)
         {
             dlua.execfile(Options.terp_files[i].c_str(), false, false);
diff --git a/crawl-ref/source/luaterp.h b/crawl-ref/source/luaterp.h
index 6e8a2b7d74..72262daf52 100644
--- a/crawl-ref/source/luaterp.h
+++ b/crawl-ref/source/luaterp.h
@@ -2,6 +2,7 @@
 #define DEBUGLUA_H
 
 void debug_terp_dlua();
+bool luaterp_running();
 
 #endif
 
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index 6fb5a692fc..44e7dbb7b1 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -21,6 +21,7 @@
 #include "delay.h"
 #include "initfile.h"
 #include "libutil.h"
+#include "luaterp.h"
 #include "macro.h"
 #include "message.h"
 #include "mon-stuff.h"
@@ -1054,7 +1055,8 @@ void more(bool user_forced)
         return;
     }
 
-    if (crawl_state.is_replaying_keys() || autoclear_more)
+    if (crawl_state.is_replaying_keys() || autoclear_more
+        || luaterp_running())
     {
         mesclr();
         return;