Add Client::getEnv() and remove some unnecessary wrappers

[minetest.git] / src / script.cpp

diff --git a/src/script.cpp b/src/script.cpp
index 14c23e009f7728b380a4fa838281d627018f3f50..1925ea701554ffdcc0f5ed86fc2de8ad2af3d767 100644 (file)
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -89,7 +89,7 @@ int luaErrorHandler(lua_State *L) {
 
 bool script_load(lua_State *L, const char *path)
 {
-       infostream<<"Loading and running script from "<<path<<std::endl;
+       verbosestream<<"Loading and running script from "<<path<<std::endl;
 
        lua_pushcfunction(L, luaErrorHandler);
        int errorhandler = lua_gettop(L);
@@ -101,8 +101,10 @@ bool script_load(lua_State *L, const char *path)
                errorstream<<"[LUA] "<<lua_tostring(L, -1)<<std::endl;
                errorstream<<"[LUA] "<<std::endl;
                lua_pop(L, 1); // Pop error message from stack
+               lua_pop(L, 1); // Pop the error handler from stack
                return false;
        }
+       lua_pop(L, 1); // Pop the error handler from stack
        return true;
 }