diff options
author | madmaxoft <github@xoft.cz> | 2014-02-17 23:12:46 +0100 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-02-17 23:12:46 +0100 |
commit | 865ae82114c7c567f3d2580f648979ad5101e0db (patch) | |
tree | 3a21dc6321acd67d1f478576fb7decb37bf6b514 /src/Bindings/LuaState.cpp | |
parent | Merge pull request #690 from tonibm19/master (diff) | |
download | cuberite-865ae82114c7c567f3d2580f648979ad5101e0db.tar cuberite-865ae82114c7c567f3d2580f648979ad5101e0db.tar.gz cuberite-865ae82114c7c567f3d2580f648979ad5101e0db.tar.bz2 cuberite-865ae82114c7c567f3d2580f648979ad5101e0db.tar.lz cuberite-865ae82114c7c567f3d2580f648979ad5101e0db.tar.xz cuberite-865ae82114c7c567f3d2580f648979ad5101e0db.tar.zst cuberite-865ae82114c7c567f3d2580f648979ad5101e0db.zip |
Diffstat (limited to 'src/Bindings/LuaState.cpp')
-rw-r--r-- | src/Bindings/LuaState.cpp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp index c6be7be3c..ca7f6b255 100644 --- a/src/Bindings/LuaState.cpp +++ b/src/Bindings/LuaState.cpp @@ -173,6 +173,31 @@ void cLuaState::Detach(void) +void cLuaState::AddPackagePath(const AString & a_PathVariable, const AString & a_Path) +{ + // Get the current path: + lua_getfield(m_LuaState, LUA_GLOBALSINDEX, "package"); // Stk: <package> + lua_getfield(m_LuaState, -1, a_PathVariable.c_str()); // Stk: <package> <package.path> + size_t len = 0; + const char * PackagePath = lua_tolstring(m_LuaState, -1, &len); + + // Append the new path: + AString NewPackagePath(PackagePath, len); + NewPackagePath.append(LUA_PATHSEP); + NewPackagePath.append(a_Path); + + // Set the new path to the environment: + lua_pop(m_LuaState, 1); // Stk: <package> + lua_pushlstring(m_LuaState, NewPackagePath.c_str(), NewPackagePath.length()); // Stk: <package> <NewPackagePath> + lua_setfield(m_LuaState, -2, a_PathVariable.c_str()); // Stk: <package> + lua_pop(m_LuaState, 1); + lua_pop(m_LuaState, 1); // Stk: - +} + + + + + bool cLuaState::LoadFile(const AString & a_FileName) { ASSERT(IsValid()); @@ -1251,6 +1276,7 @@ void cLuaState::LogStack(lua_State * a_LuaState, const char * a_Header) case LUA_TLIGHTUSERDATA: Printf(Value, "%p", lua_touserdata(a_LuaState, i)); break; case LUA_TNUMBER: Printf(Value, "%f", (double)lua_tonumber(a_LuaState, i)); break; case LUA_TSTRING: Printf(Value, "%s", lua_tostring(a_LuaState, i)); break; + case LUA_TTABLE: Printf(Value, "%p", lua_topointer(a_LuaState, i)); break; default: break; } LOGD(" Idx %d: type %d (%s) %s", i, Type, lua_typename(a_LuaState, Type), Value.c_str()); |