diff options
| -rw-r--r-- | crawl-ref/source/clua.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/dat/clua/init.lua | 14 | ||||
| -rw-r--r-- | crawl-ref/source/luaterp.cc | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc index 48dadbb355..56adc93ff9 100644 --- a/crawl-ref/source/clua.cc +++ b/crawl-ref/source/clua.cc @@ -594,6 +594,7 @@ void CLua::init_lua() lua_register(_state, "require", _clua_require); execfile("clua/util.lua", true, true); + execfile("clua/init.lua", true, true); if (managed_vm) { diff --git a/crawl-ref/source/dat/clua/init.lua b/crawl-ref/source/dat/clua/init.lua new file mode 100644 index 0000000000..51d5ab0401 --- /dev/null +++ b/crawl-ref/source/dat/clua/init.lua @@ -0,0 +1,14 @@ +------------------------------------------------------------------------------ +-- init.lua +-- Common CLua initializtion. +------------------------------------------------------------------------------ + +----- +-- Set up echoing function for interpreter. +----- + +function echoall(...) + util.foreach({...}, crawl.mpr) +end + +__echo = echoall diff --git a/crawl-ref/source/luaterp.cc b/crawl-ref/source/luaterp.cc index 8eeae9fe39..6e6fcad3d6 100644 --- a/crawl-ref/source/luaterp.cc +++ b/crawl-ref/source/luaterp.cc @@ -120,10 +120,9 @@ void run_clua_interpreter(lua_State *ls) lua_insert(ls, 1); if (lua_pcall(ls, lua_gettop(ls) - 1, 0, 0) != 0) { - mprf(MSGCH_ERROR, "error calling crawl.mpr (%s)", + mprf(MSGCH_ERROR, "error calling __echo (%s)", lua_tostring(ls, -1)); } -// mpr("got return values"); } } lua_settop(ls, 0); // clear stack |