change bot protection

This commit is contained in:
Eduardo Bart
2012-01-06 17:25:27 -02:00
parent 9909ffed35
commit f3c0260ea2
6 changed files with 49 additions and 25 deletions

View File

@@ -28,9 +28,11 @@
LuaInterface g_lua;
LuaInterface::LuaInterface() :
L(NULL), m_weakTableRef(0)
LuaInterface::LuaInterface()
{
L = nullptr;
m_cppCallbackDepth = 0;
m_weakTableRef = 0;
}
LuaInterface::~LuaInterface()
@@ -529,7 +531,9 @@ int LuaInterface::luaCppFunctionCallback(lua_State* L)
// do the call
try {
g_lua.m_cppCallbackDepth++;
numRets = (*(funcPtr->get()))(&g_lua);
g_lua.m_cppCallbackDepth--;
assert(numRets == g_lua.stackSize());
} catch(LuaException &e) {
logError("lua cpp callback failed: ", e.what());

View File

@@ -181,6 +181,8 @@ public:
template<typename R, typename... T>
R callGlobalField(const std::string& global, const std::string& field, const T&... args);
bool isInCppCallback() { return m_cppCallbackDepth != 0; }
private:
/// Load scripts requested by lua 'require'
static int luaScriptLoader(lua_State* L);
@@ -311,6 +313,7 @@ public:
private:
lua_State* L;
int m_weakTableRef;
int m_cppCallbackDepth;
};
extern LuaInterface g_lua;