diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-03-15 02:46:18 +0100 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-03-15 02:46:18 +0100 |
commit | 8316ae330ec06b19caf678b9d499afd198fe5a06 (patch) | |
tree | 9e120574de49e90f970910ffe743e8169d762ceb /src/Bindings/LuaState.cpp | |
parent | Add item frame saving. (diff) | |
parent | Ignoring all config and SQLite files in the output folder. (diff) | |
download | cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.gz cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.bz2 cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.lz cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.xz cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.zst cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.zip |
Diffstat (limited to 'src/Bindings/LuaState.cpp')
-rw-r--r-- | src/Bindings/LuaState.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp index 1890dcfe5..f24e15c3b 100644 --- a/src/Bindings/LuaState.cpp +++ b/src/Bindings/LuaState.cpp @@ -94,12 +94,20 @@ void cLuaState::Create(void) } m_LuaState = lua_open(); luaL_openlibs(m_LuaState); + m_IsOwned = true; +} + + + + + +void cLuaState::RegisterAPILibs(void) +{ tolua_AllToLua_open(m_LuaState); ManualBindings::Bind(m_LuaState); DeprecatedBindings::Bind(m_LuaState); luaopen_lsqlite3(m_LuaState); luaopen_lxp(m_LuaState); - m_IsOwned = true; } @@ -677,6 +685,7 @@ void cLuaState::Push(Vector3i * a_Vector) void cLuaState::Push(void * a_Ptr) { + UNUSED(a_Ptr); ASSERT(IsValid()); // Investigate the cause of this - what is the callstack? @@ -733,10 +742,6 @@ void cLuaState::GetStackValue(int a_StackPos, AString & a_Value) { a_Value.assign(data, len); } - else - { - a_Value.clear(); - } } @@ -1280,7 +1285,9 @@ void cLuaState::LogStack(lua_State * a_LuaState, const char * a_Header) { UNUSED(a_Header); // The param seems unused when compiling for release, so the compiler warns - LOGD((a_Header != NULL) ? a_Header : "Lua C API Stack contents:"); + + // Format string consisting only of %s is used to appease the compiler + LOGD("%s",(a_Header != NULL) ? a_Header : "Lua C API Stack contents:"); for (int i = lua_gettop(a_LuaState); i > 0; i--) { AString Value; |