diff options
author | madmaxoft <github@xoft.cz> | 2014-01-11 21:22:40 +0100 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-01-11 21:22:40 +0100 |
commit | acfebab0272e605a05e39ef1926f1d4216faf236 (patch) | |
tree | d3f4ddba916eca6beb41783408a41bd7504d55a5 | |
parent | Removed unused variables. (diff) | |
download | cuberite-acfebab0272e605a05e39ef1926f1d4216faf236.tar cuberite-acfebab0272e605a05e39ef1926f1d4216faf236.tar.gz cuberite-acfebab0272e605a05e39ef1926f1d4216faf236.tar.bz2 cuberite-acfebab0272e605a05e39ef1926f1d4216faf236.tar.lz cuberite-acfebab0272e605a05e39ef1926f1d4216faf236.tar.xz cuberite-acfebab0272e605a05e39ef1926f1d4216faf236.tar.zst cuberite-acfebab0272e605a05e39ef1926f1d4216faf236.zip |
Diffstat (limited to '')
-rw-r--r-- | VC2008/MCServer.vcproj | 4 | ||||
-rw-r--r-- | src/Bindings/AllToLua.pkg | 2 | ||||
-rw-r--r-- | src/Bindings/tolua_base.h | 128 |
3 files changed, 0 insertions, 134 deletions
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index a017b5a25..3b10092f0 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -2018,10 +2018,6 @@ > </File> <File - RelativePath="..\src\Bindings\tolua_base.h" - > - </File> - <File RelativePath="..\src\Bindings\WebPlugin.cpp" > </File> diff --git a/src/Bindings/AllToLua.pkg b/src/Bindings/AllToLua.pkg index e9a5ea0c6..0dcead7d2 100644 --- a/src/Bindings/AllToLua.pkg +++ b/src/Bindings/AllToLua.pkg @@ -1,8 +1,6 @@ $#include "../Globals.h" -$#include "tolua_base.h" - // Typedefs from Globals.h, so that we don't have to process that file: typedef long long Int64; typedef int Int32; diff --git a/src/Bindings/tolua_base.h b/src/Bindings/tolua_base.h deleted file mode 100644 index 6a76f97b1..000000000 --- a/src/Bindings/tolua_base.h +++ /dev/null @@ -1,128 +0,0 @@ -#ifndef TOLUA_BASE_H -#define TOLUA_BASE_H - -#pragma warning(disable:4800) // This file is ONLY included by Bindings.cpp and it throws lots of C4800 warnings - -#include "tolua++/include/tolua++.h" - - - - - -class ToluaBase { - - int lua_instance; - -protected: - - lua_State* lua_state; - - void lua_stacktrace(lua_State* L) const - { - lua_Debug entry; - int depth = 0; - - while (lua_getstack(L, depth, &entry)) - { - lua_getinfo(L, "Sln", &entry); - - LOGERROR("%s(%d): %s", entry.short_src, entry.currentline, entry.name ? entry.name : "?"); - depth++; - } - } - - - bool report_errors(int status) const - { - if ( status!=0 ) - { - const char* s = lua_tostring(lua_state, -1); - LOGERROR("-- %s", s ); - //lua_pop(lua_state, 1); - LOGERROR("Stack:"); - lua_stacktrace( lua_state ); - return true; - } - return false; - } - - bool push_method(const char* name, lua_CFunction f) const { - - if (!lua_state) return false; - - lua_getref(lua_state, lua_instance); - lua_pushstring(lua_state, name); - //LOGINFO("1. push_method() Stack size: %i", lua_gettop( lua_state ) ); - lua_gettable(lua_state, -2); - //LOGINFO("2. push_method() Stack size: %i", lua_gettop( lua_state ) ); - - if (lua_isnil(lua_state, -1)) { - - // pop the table - lua_pop(lua_state, 2); - return false; - - } else { - - if (f) { - if (lua_iscfunction(lua_state, -1)) { - lua_pop(lua_state, 2); - return false; - }; - /* // not for now - lua_pushcfunction(lua_state, f); - if (lua_rawequal(lua_state, -1, -2)) { - - // avoid recursion, pop both functions and the table - lua_pop(lua_state, 3); - return false; - }; - - // pop f - lua_pop(lua_state, 1); - */ - }; - - // swap table with function - lua_insert(lua_state, -2); - }; - - return true; - }; - - void dbcall(lua_State* L, int nargs, int nresults) const { - - // using lua_call for now - int s = lua_pcall(L, nargs, nresults, 0); - report_errors( s ); - }; -public: - - int GetInstance() { return lua_instance; } - lua_State* GetLuaState() { return lua_state; } - - void tolua__set_instance(lua_State* L, lua_Object lo) { - - lua_state = L; - - lua_pushvalue(L, lo); - lua_instance = lua_ref(lua_state, 1); - }; - - ToluaBase() { - - lua_state = NULL; - }; - - ~ToluaBase() { - - if (lua_state) { - - lua_unref(lua_state, lua_instance); - }; - }; -}; - -#endif - - |