summaryrefslogtreecommitdiffstats
path: root/source/Plugin_NewLua.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/Plugin_NewLua.cpp750
1 files changed, 300 insertions, 450 deletions
diff --git a/source/Plugin_NewLua.cpp b/source/Plugin_NewLua.cpp
index 8b0f047cd..704bb3a95 100644
--- a/source/Plugin_NewLua.cpp
+++ b/source/Plugin_NewLua.cpp
@@ -7,45 +7,10 @@
extern "C"
{
-#include "lualib.h"
+ #include "lualib.h"
}
#include "tolua++.h"
-#include "Bindings.h"
-#include "ManualBindings.h"
-
-
-
-
-
-// fwd: SQLite/lsqlite3.c
-extern "C"
-{
- LUALIB_API int luaopen_lsqlite3(lua_State * L);
-}
-
-// fwd: LuaExpat/lxplib.c:
-extern "C"
-{
- int luaopen_lxp(lua_State * L);
-}
-
-
-
-
-
-bool report_errors(lua_State * lua, int status)
-{
- if (status == 0)
- {
- // No error to report
- return false;
- }
-
- LOGERROR("LUA: %s", lua_tostring(lua, -1));
- lua_pop(lua, 1);
- return true;
-}
@@ -54,10 +19,9 @@ bool report_errors(lua_State * lua, int status)
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cPlugin_NewLua:
-cPlugin_NewLua::cPlugin_NewLua(const AString & a_PluginDirectory)
- : m_LuaState( 0 )
- , cWebPlugin()
- , cPlugin(a_PluginDirectory)
+cPlugin_NewLua::cPlugin_NewLua(const AString & a_PluginDirectory) :
+ cPlugin(a_PluginDirectory),
+ m_LuaState(Printf("plugin %s", a_PluginDirectory.c_str()))
{
}
@@ -68,12 +32,7 @@ cPlugin_NewLua::cPlugin_NewLua(const AString & a_PluginDirectory)
cPlugin_NewLua::~cPlugin_NewLua()
{
cCSLock Lock(m_CriticalSection);
-
- if( m_LuaState )
- {
- lua_close( m_LuaState );
- m_LuaState = 0;
- }
+ m_LuaState.Close();
}
@@ -83,14 +42,9 @@ cPlugin_NewLua::~cPlugin_NewLua()
bool cPlugin_NewLua::Initialize(void)
{
cCSLock Lock(m_CriticalSection);
- if (m_LuaState == NULL)
+ if (!m_LuaState.IsValid())
{
- m_LuaState = lua_open();
- luaL_openlibs(m_LuaState);
- tolua_AllToLua_open(m_LuaState);
- ManualBindings::Bind(m_LuaState);
- luaopen_lsqlite3(m_LuaState);
- luaopen_lxp(m_LuaState);
+ m_LuaState.Create();
// Inject the identification global variables into the state:
lua_pushlightuserdata(m_LuaState, this);
@@ -110,47 +64,32 @@ bool cPlugin_NewLua::Initialize(void)
continue;
}
AString Path = PluginPath + *itr;
- int s = luaL_loadfile(m_LuaState, Path.c_str() );
- if( report_errors( m_LuaState, s ) )
+ if (!m_LuaState.LoadFile(Path))
{
- LOGERROR("Can't load plugin %s because of an error in file %s", GetLocalDirectory().c_str(), Path.c_str() );
- lua_close( m_LuaState );
- m_LuaState = 0;
- return false;
- }
-
- s = lua_pcall(m_LuaState, 0, LUA_MULTRET, 0);
- if( report_errors( m_LuaState, s ) )
- {
- LOGERROR("Error in plugin %s in file %s", GetLocalDirectory().c_str(), Path.c_str() );
- lua_close( m_LuaState );
- m_LuaState = 0;
+ m_LuaState.Close();
return false;
}
} // for itr - Files[]
// Call intialize function
- if (!PushFunction("Initialize"))
+ if (!m_LuaState.PushFunction("Initialize"))
{
- lua_close( m_LuaState );
- m_LuaState = 0;
+ m_LuaState.Close();
return false;
}
- tolua_pushusertype(m_LuaState, this, "cPlugin_NewLua");
+ m_LuaState.PushUserType(this, "cPlugin_NewLua");
- if (!CallFunction(1, 1, "Initialize"))
+ if (!m_LuaState.CallFunction(1))
{
- lua_close( m_LuaState );
- m_LuaState = 0;
+ m_LuaState.Close();
return false;
}
- if( !lua_isboolean( m_LuaState, -1 ) )
+ if (!lua_isboolean(m_LuaState, -1))
{
- LOGWARN("Error in plugin %s Initialize() must return a boolean value!", GetLocalDirectory().c_str() );
- lua_close( m_LuaState );
- m_LuaState = 0;
+ LOGWARNING("Error in plugin %s: Initialize() must return a boolean value!", GetName().c_str());
+ m_LuaState.Close();
return false;
}
@@ -165,12 +104,12 @@ bool cPlugin_NewLua::Initialize(void)
void cPlugin_NewLua::OnDisable()
{
cCSLock Lock(m_CriticalSection);
- if (!PushFunction("OnDisable", false)) // false = don't log error if not found
+ if (!m_LuaState.PushFunction("OnDisable", false)) // false = don't log error if not found
{
return;
}
- CallFunction(0, 0, "OnDisable");
+ m_LuaState.CallFunction(0);
}
@@ -181,14 +120,12 @@ void cPlugin_NewLua::Tick(float a_Dt)
{
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_TICK);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return;
}
-
- tolua_pushnumber( m_LuaState, a_Dt );
-
- CallFunction(1, 0, FnName);
+ m_LuaState.PushNumber(a_Dt);
+ m_LuaState.CallFunction(0);
}
@@ -200,21 +137,21 @@ bool cPlugin_NewLua::OnBlockToPickups(cWorld * a_World, cEntity * a_Digger, int
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_BLOCK_TO_PICKUPS);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, a_World, "cWorld");
- tolua_pushusertype(m_LuaState, a_Digger, "cEntity");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushnumber (m_LuaState, a_BlockType);
- tolua_pushnumber (m_LuaState, a_BlockMeta);
- tolua_pushusertype(m_LuaState, &a_Pickups, "cItems");
+ m_LuaState.PushObject(a_World);
+ m_LuaState.PushObject(a_Digger);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushNumber(a_BlockType);
+ m_LuaState.PushNumber(a_BlockMeta);
+ m_LuaState.PushObject(&a_Pickups);
- if (!CallFunction(8, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -233,15 +170,15 @@ bool cPlugin_NewLua::OnChat(cPlayer * a_Player, AString & a_Message)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_CHAT);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, a_Player, "cPlayer");
- tolua_pushstring (m_LuaState, a_Message.c_str());
+ m_LuaState.PushObject(a_Player);
+ m_LuaState.PushString(a_Message.c_str());
- if (!CallFunction(2, 2, FnName))
+ if (!m_LuaState.CallFunction(2))
{
return false;
}
@@ -264,16 +201,16 @@ bool cPlugin_NewLua::OnChunkAvailable(cWorld * a_World, int a_ChunkX, int a_Chun
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_CHUNK_AVAILABLE);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, a_World, "cWorld");
- tolua_pushnumber (m_LuaState, a_ChunkX);
- tolua_pushnumber (m_LuaState, a_ChunkZ);
+ m_LuaState.PushObject(a_World);
+ m_LuaState.PushNumber(a_ChunkX);
+ m_LuaState.PushNumber(a_ChunkZ);
- if (!CallFunction(3, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -292,17 +229,17 @@ bool cPlugin_NewLua::OnChunkGenerated(cWorld * a_World, int a_ChunkX, int a_Chun
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_CHUNK_GENERATED);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, a_World, "cWorld");
- tolua_pushnumber (m_LuaState, a_ChunkX);
- tolua_pushnumber (m_LuaState, a_ChunkZ);
- tolua_pushusertype(m_LuaState, a_ChunkDesc, "cChunkDesc");
+ m_LuaState.PushObject(a_World);
+ m_LuaState.PushNumber(a_ChunkX);
+ m_LuaState.PushNumber(a_ChunkZ);
+ m_LuaState.PushUserType(a_ChunkDesc, "cChunkDesc");
- if (!CallFunction(4, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -316,22 +253,22 @@ bool cPlugin_NewLua::OnChunkGenerated(cWorld * a_World, int a_ChunkX, int a_Chun
-bool cPlugin_NewLua::OnChunkGenerating(cWorld * a_World, int a_ChunkX, int a_ChunkZ, cChunkDesc * a_pLuaChunk)
+bool cPlugin_NewLua::OnChunkGenerating(cWorld * a_World, int a_ChunkX, int a_ChunkZ, cChunkDesc * a_ChunkDesc)
{
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_CHUNK_GENERATING);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, a_World, "cWorld");
- tolua_pushnumber (m_LuaState, a_ChunkX);
- tolua_pushnumber (m_LuaState, a_ChunkZ);
- tolua_pushusertype(m_LuaState, a_pLuaChunk, "cChunkDesc");
+ m_LuaState.PushObject(a_World);
+ m_LuaState.PushNumber(a_ChunkX);
+ m_LuaState.PushNumber(a_ChunkZ);
+ m_LuaState.PushUserType(a_ChunkDesc, "cChunkDesc");
- if (!CallFunction(4, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -350,16 +287,16 @@ bool cPlugin_NewLua::OnChunkUnloaded(cWorld * a_World, int a_ChunkX, int a_Chunk
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_CHUNK_UNLOADED);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, a_World, "cWorld");
- tolua_pushnumber (m_LuaState, a_ChunkX);
- tolua_pushnumber (m_LuaState, a_ChunkZ);
+ m_LuaState.PushObject(a_World);
+ m_LuaState.PushNumber(a_ChunkX);
+ m_LuaState.PushNumber(a_ChunkZ);
- if (!CallFunction(3, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -378,16 +315,16 @@ bool cPlugin_NewLua::OnChunkUnloading(cWorld * a_World, int a_ChunkX, int a_Chun
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_CHUNK_UNLOADING);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, a_World, "cWorld");
- tolua_pushnumber (m_LuaState, a_ChunkX);
- tolua_pushnumber (m_LuaState, a_ChunkZ);
+ m_LuaState.PushObject(a_World);
+ m_LuaState.PushNumber(a_ChunkX);
+ m_LuaState.PushNumber(a_ChunkZ);
- if (!CallFunction(3, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -406,15 +343,15 @@ bool cPlugin_NewLua::OnCollectingPickup(cPlayer * a_Player, cPickup * a_Pickup)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_COLLECTING_PICKUP);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, a_Player, "cPlayer");
- tolua_pushusertype(m_LuaState, a_Pickup, "cPickup");
+ m_LuaState.PushObject(a_Player);
+ m_LuaState.PushObject(a_Pickup);
- if (!CallFunction(2, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -433,16 +370,16 @@ bool cPlugin_NewLua::OnCraftingNoRecipe(const cPlayer * a_Player, const cCraftin
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_CRAFTING_NO_RECIPE);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, (void *)a_Player, "cPlayer");
- tolua_pushusertype(m_LuaState, (void *)a_Grid, "cCraftingGrid");
- tolua_pushusertype(m_LuaState, (void *)a_Recipe, "cCraftingRecipe");
+ m_LuaState.PushUserType((void *)a_Player, "cPlayer");
+ m_LuaState.PushUserType((void *)a_Grid, "cCraftingGrid");
+ m_LuaState.PushUserType((void *)a_Recipe, "cCraftingRecipe");
- if (!CallFunction(3, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -461,15 +398,15 @@ bool cPlugin_NewLua::OnDisconnect(cPlayer * a_Player, const AString & a_Reason)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_DISCONNECT);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, a_Player, "cPlayer");
- tolua_pushstring (m_LuaState, a_Reason.c_str());
+ m_LuaState.PushObject(a_Player);
+ m_LuaState.PushString(a_Reason.c_str());
- if (!CallFunction(2, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -488,27 +425,15 @@ bool cPlugin_NewLua::OnExecuteCommand(cPlayer * a_Player, const AStringVector &
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_EXECUTE_COMMAND);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, a_Player, "cPlayer");
-
- // Push the split:
- lua_createtable(m_LuaState, a_Split.size(), 0);
- int newTable = lua_gettop(m_LuaState);
- int index = 1;
- std::vector<std::string>::const_iterator iter = a_Split.begin(), end = a_Split.end();
- while(iter != end)
- {
- tolua_pushstring(m_LuaState, (*iter).c_str());
- lua_rawseti(m_LuaState, newTable, index);
- ++iter;
- ++index;
- }
+ m_LuaState.PushObject(a_Player);
+ m_LuaState.PushStringVector(a_Split);
- if (!CallFunction(2, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -527,15 +452,15 @@ bool cPlugin_NewLua::OnHandshake(cClientHandle * a_Client, const AString & a_Use
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_HANDSHAKE);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, a_Client, "cClientHandle");
- tolua_pushstring (m_LuaState, a_Username.c_str());
+ m_LuaState.PushUserType(a_Client, "cClientHandle");
+ m_LuaState.PushString (a_Username.c_str());
- if (!CallFunction(2, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -554,15 +479,15 @@ bool cPlugin_NewLua::OnKilling(cEntity & a_Victim, cEntity * a_Killer)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_KILLING);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Victim, "cEntity");
- tolua_pushusertype(m_LuaState, a_Killer, "cEntity");
+ m_LuaState.PushObject(&a_Victim);
+ m_LuaState.PushObject(a_Killer);
- if (!CallFunction(2, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -581,16 +506,16 @@ bool cPlugin_NewLua::OnLogin(cClientHandle * a_Client, int a_ProtocolVersion, co
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_LOGIN);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype (m_LuaState, a_Client, "cClientHandle");
- tolua_pushnumber (m_LuaState, a_ProtocolVersion);
- tolua_pushcppstring(m_LuaState, a_Username);
+ m_LuaState.PushObject(a_Client);
+ m_LuaState.PushNumber(a_ProtocolVersion);
+ m_LuaState.PushString(a_Username.c_str());
- if (!CallFunction(3, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -609,20 +534,20 @@ bool cPlugin_NewLua::OnPlayerBreakingBlock(cPlayer & a_Player, int a_BlockX, int
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_BREAKING_BLOCK);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushnumber (m_LuaState, a_BlockFace);
- tolua_pushnumber (m_LuaState, a_BlockType);
- tolua_pushnumber (m_LuaState, a_BlockMeta);
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushNumber(a_BlockFace);
+ m_LuaState.PushNumber(a_BlockType);
+ m_LuaState.PushNumber(a_BlockMeta);
- if (!CallFunction(7, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -641,20 +566,20 @@ bool cPlugin_NewLua::OnPlayerBrokenBlock(cPlayer & a_Player, int a_BlockX, int a
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_BROKEN_BLOCK);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushnumber (m_LuaState, a_BlockFace);
- tolua_pushnumber (m_LuaState, a_BlockType);
- tolua_pushnumber (m_LuaState, a_BlockMeta);
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushNumber(a_BlockFace);
+ m_LuaState.PushNumber(a_BlockType);
+ m_LuaState.PushNumber(a_BlockMeta);
- if (!CallFunction(7, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -673,14 +598,14 @@ bool cPlugin_NewLua::OnPlayerEating(cPlayer & a_Player)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_EATING);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
+ m_LuaState.PushObject(&a_Player);
- if (!CallFunction(1, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -699,14 +624,14 @@ bool cPlugin_NewLua::OnPlayerJoined(cPlayer & a_Player)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_JOINED);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
+ m_LuaState.PushObject(&a_Player);
- if (!CallFunction(1, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -725,19 +650,19 @@ bool cPlugin_NewLua::OnPlayerLeftClick(cPlayer & a_Player, int a_BlockX, int a_B
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_LEFT_CLICK);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushnumber (m_LuaState, a_BlockFace);
- tolua_pushnumber (m_LuaState, a_Status);
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushNumber(a_BlockFace);
+ m_LuaState.PushNumber(a_Status);
- if (!CallFunction(6, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -756,14 +681,14 @@ bool cPlugin_NewLua::OnPlayerMoved(cPlayer & a_Player)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_MOVING);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
+ m_LuaState.PushObject(&a_Player);
- if (!CallFunction(1, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -782,23 +707,23 @@ bool cPlugin_NewLua::OnPlayerPlacedBlock(cPlayer & a_Player, int a_BlockX, int a
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_PLACED_BLOCK);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushnumber (m_LuaState, a_BlockFace);
- tolua_pushnumber (m_LuaState, a_CursorX);
- tolua_pushnumber (m_LuaState, a_CursorY);
- tolua_pushnumber (m_LuaState, a_CursorZ);
- tolua_pushnumber (m_LuaState, a_BlockType);
- tolua_pushnumber (m_LuaState, a_BlockMeta);
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushNumber(a_BlockFace);
+ m_LuaState.PushNumber(a_CursorX);
+ m_LuaState.PushNumber(a_CursorY);
+ m_LuaState.PushNumber(a_CursorZ);
+ m_LuaState.PushNumber(a_BlockType);
+ m_LuaState.PushNumber(a_BlockMeta);
- if (!CallFunction(10, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -817,23 +742,23 @@ bool cPlugin_NewLua::OnPlayerPlacingBlock(cPlayer & a_Player, int a_BlockX, int
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_PLACING_BLOCK);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushnumber (m_LuaState, a_BlockFace);
- tolua_pushnumber (m_LuaState, a_CursorX);
- tolua_pushnumber (m_LuaState, a_CursorY);
- tolua_pushnumber (m_LuaState, a_CursorZ);
- tolua_pushnumber (m_LuaState, a_BlockType);
- tolua_pushnumber (m_LuaState, a_BlockMeta);
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushNumber(a_BlockFace);
+ m_LuaState.PushNumber(a_CursorX);
+ m_LuaState.PushNumber(a_CursorY);
+ m_LuaState.PushNumber(a_CursorZ);
+ m_LuaState.PushNumber(a_BlockType);
+ m_LuaState.PushNumber(a_BlockMeta);
- if (!CallFunction(10, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -852,21 +777,21 @@ bool cPlugin_NewLua::OnPlayerRightClick(cPlayer & a_Player, int a_BlockX, int a_
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_RIGHT_CLICK);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushnumber (m_LuaState, a_BlockFace);
- tolua_pushnumber (m_LuaState, a_CursorX);
- tolua_pushnumber (m_LuaState, a_CursorY);
- tolua_pushnumber (m_LuaState, a_CursorZ);
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushNumber(a_BlockFace);
+ m_LuaState.PushNumber(a_CursorX);
+ m_LuaState.PushNumber(a_CursorY);
+ m_LuaState.PushNumber(a_CursorZ);
- if (!CallFunction(8, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -885,15 +810,15 @@ bool cPlugin_NewLua::OnPlayerRightClickingEntity(cPlayer & a_Player, cEntity & a
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_RIGHT_CLICKING_ENTITY);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushusertype(m_LuaState, &a_Entity, "cEntity");
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushObject(&a_Entity);
- if (!CallFunction(2, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -912,14 +837,14 @@ bool cPlugin_NewLua::OnPlayerShooting(cPlayer & a_Player)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_SHOOTING);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
+ m_LuaState.PushObject(&a_Player);
- if (!CallFunction(1, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -938,14 +863,14 @@ bool cPlugin_NewLua::OnPlayerSpawned(cPlayer & a_Player)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_SPAWNED);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
+ m_LuaState.PushObject(&a_Player);
- if (!CallFunction(1, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -964,14 +889,14 @@ bool cPlugin_NewLua::OnPlayerTossingItem(cPlayer & a_Player)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_TOSSING_ITEM);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
+ m_LuaState.PushObject(&a_Player);
- if (!CallFunction(1, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -990,23 +915,23 @@ bool cPlugin_NewLua::OnPlayerUsedBlock(cPlayer & a_Player, int a_BlockX, int a_B
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_USED_BLOCK);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushnumber (m_LuaState, a_BlockFace);
- tolua_pushnumber (m_LuaState, a_CursorX);
- tolua_pushnumber (m_LuaState, a_CursorY);
- tolua_pushnumber (m_LuaState, a_CursorZ);
- tolua_pushnumber (m_LuaState, a_BlockType);
- tolua_pushnumber (m_LuaState, a_BlockMeta);
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushNumber(a_BlockFace);
+ m_LuaState.PushNumber(a_CursorX);
+ m_LuaState.PushNumber(a_CursorY);
+ m_LuaState.PushNumber(a_CursorZ);
+ m_LuaState.PushNumber(a_BlockType);
+ m_LuaState.PushNumber(a_BlockMeta);
- if (!CallFunction(10, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -1025,21 +950,21 @@ bool cPlugin_NewLua::OnPlayerUsedItem(cPlayer & a_Player, int a_BlockX, int a_Bl
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_USED_ITEM);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushnumber (m_LuaState, a_BlockFace);
- tolua_pushnumber (m_LuaState, a_CursorX);
- tolua_pushnumber (m_LuaState, a_CursorY);
- tolua_pushnumber (m_LuaState, a_CursorZ);
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushNumber(a_BlockFace);
+ m_LuaState.PushNumber(a_CursorX);
+ m_LuaState.PushNumber(a_CursorY);
+ m_LuaState.PushNumber(a_CursorZ);
- if (!CallFunction(8, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -1058,23 +983,23 @@ bool cPlugin_NewLua::OnPlayerUsingBlock(cPlayer & a_Player, int a_BlockX, int a_
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_USING_BLOCK);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushnumber (m_LuaState, a_BlockFace);
- tolua_pushnumber (m_LuaState, a_CursorX);
- tolua_pushnumber (m_LuaState, a_CursorY);
- tolua_pushnumber (m_LuaState, a_CursorZ);
- tolua_pushnumber (m_LuaState, a_BlockType);
- tolua_pushnumber (m_LuaState, a_BlockMeta);
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushNumber(a_BlockFace);
+ m_LuaState.PushNumber(a_CursorX);
+ m_LuaState.PushNumber(a_CursorY);
+ m_LuaState.PushNumber(a_CursorZ);
+ m_LuaState.PushNumber(a_BlockType);
+ m_LuaState.PushNumber(a_BlockMeta);
- if (!CallFunction(10, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -1093,21 +1018,21 @@ bool cPlugin_NewLua::OnPlayerUsingItem(cPlayer & a_Player, int a_BlockX, int a_B
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_USING_ITEM);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushnumber (m_LuaState, a_BlockFace);
- tolua_pushnumber (m_LuaState, a_CursorX);
- tolua_pushnumber (m_LuaState, a_CursorY);
- tolua_pushnumber (m_LuaState, a_CursorZ);
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushNumber(a_BlockFace);
+ m_LuaState.PushNumber(a_CursorX);
+ m_LuaState.PushNumber(a_CursorY);
+ m_LuaState.PushNumber(a_CursorZ);
- if (!CallFunction(8, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -1126,16 +1051,16 @@ bool cPlugin_NewLua::OnPostCrafting(const cPlayer * a_Player, const cCraftingGri
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_POST_CRAFTING);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, (void *)a_Player, "cPlayer");
- tolua_pushusertype(m_LuaState, (void *)a_Grid, "cCraftingGrid");
- tolua_pushusertype(m_LuaState, (void *)a_Recipe, "cCraftingRecipe");
+ m_LuaState.PushUserType((void *)a_Player, "cPlayer");
+ m_LuaState.PushUserType((void *)a_Grid, "cCraftingGrid");
+ m_LuaState.PushUserType((void *)a_Recipe, "cCraftingRecipe");
- if (!CallFunction(3, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -1154,16 +1079,16 @@ bool cPlugin_NewLua::OnPreCrafting(const cPlayer * a_Player, const cCraftingGrid
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_PRE_CRAFTING);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, (void *)a_Player, "cPlayer");
- tolua_pushusertype(m_LuaState, (void *)a_Grid, "cCraftingGrid");
- tolua_pushusertype(m_LuaState, (void *)a_Recipe, "cCraftingRecipe");
+ m_LuaState.PushUserType((void *)a_Player, "cPlayer");
+ m_LuaState.PushUserType((void *)a_Grid, "cCraftingGrid");
+ m_LuaState.PushUserType((void *)a_Recipe, "cCraftingRecipe");
- if (!CallFunction(3, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -1182,15 +1107,15 @@ bool cPlugin_NewLua::OnTakeDamage(cEntity & a_Receiver, TakeDamageInfo & a_TDI)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_TAKE_DAMAGE);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_Receiver, "cEntity");
- tolua_pushusertype(m_LuaState, &a_TDI, "TakeDamageInfo");
+ m_LuaState.PushObject(&a_Receiver);
+ m_LuaState.PushUserType(&a_TDI, "TakeDamageInfo");
- if (!CallFunction(2, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -1214,22 +1139,22 @@ bool cPlugin_NewLua::OnUpdatedSign(
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_UPDATED_SIGN);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, (void *)a_World, "cWorld");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushstring (m_LuaState, a_Line1.c_str());
- tolua_pushstring (m_LuaState, a_Line2.c_str());
- tolua_pushstring (m_LuaState, a_Line3.c_str());
- tolua_pushstring (m_LuaState, a_Line4.c_str());
- tolua_pushusertype(m_LuaState, (void *)a_Player, "cPlayer");
+ m_LuaState.PushObject(a_World);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushString(a_Line1.c_str());
+ m_LuaState.PushString(a_Line2.c_str());
+ m_LuaState.PushString(a_Line3.c_str());
+ m_LuaState.PushString(a_Line4.c_str());
+ m_LuaState.PushObject(a_Player);
- if (!CallFunction(9, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -1253,22 +1178,22 @@ bool cPlugin_NewLua::OnUpdatingSign(
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_UPDATING_SIGN);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, (void *)a_World, "cWorld");
- tolua_pushnumber (m_LuaState, a_BlockX);
- tolua_pushnumber (m_LuaState, a_BlockY);
- tolua_pushnumber (m_LuaState, a_BlockZ);
- tolua_pushstring (m_LuaState, a_Line1.c_str());
- tolua_pushstring (m_LuaState, a_Line2.c_str());
- tolua_pushstring (m_LuaState, a_Line3.c_str());
- tolua_pushstring (m_LuaState, a_Line4.c_str());
- tolua_pushusertype(m_LuaState, (void *)a_Player, "cPlayer");
+ m_LuaState.PushObject(a_World);
+ m_LuaState.PushNumber(a_BlockX);
+ m_LuaState.PushNumber(a_BlockY);
+ m_LuaState.PushNumber(a_BlockZ);
+ m_LuaState.PushString(a_Line1.c_str());
+ m_LuaState.PushString(a_Line2.c_str());
+ m_LuaState.PushString(a_Line3.c_str());
+ m_LuaState.PushString(a_Line4.c_str());
+ m_LuaState.PushObject(a_Player);
- if (!CallFunction(9, 5, "OnUpdatingSign"))
+ if (!m_LuaState.CallFunction(5))
{
return false;
}
@@ -1303,14 +1228,14 @@ bool cPlugin_NewLua::OnWeatherChanged(cWorld & a_World)
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_WEATHER_CHANGED);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_World, "cWorld");
+ m_LuaState.PushObject(&a_World);
- if (!CallFunction(1, 1, FnName))
+ if (!m_LuaState.CallFunction(1))
{
return false;
}
@@ -1329,15 +1254,15 @@ bool cPlugin_NewLua::OnWeatherChanging(cWorld & a_World, eWeather & a_NewWeather
cCSLock Lock(m_CriticalSection);
const char * FnName = GetHookFnName(cPluginManager::HOOK_WEATHER_CHANGED);
ASSERT(FnName != NULL);
- if (!PushFunction(FnName))
+ if (!m_LuaState.PushFunction(FnName))
{
return false;
}
- tolua_pushusertype(m_LuaState, &a_World, "cWorld");
- tolua_pushnumber (m_LuaState, a_NewWeather);
+ m_LuaState.PushObject(&a_World);
+ m_LuaState.PushNumber(a_NewWeather);
- if (!CallFunction(2, 2, FnName))
+ if (!m_LuaState.CallFunction(2))
{
return false;
}
@@ -1368,29 +1293,19 @@ bool cPlugin_NewLua::HandleCommand(const AStringVector & a_Split, cPlayer * a_Pl
cCSLock Lock(m_CriticalSection);
// Push the function to be called:
- lua_rawgeti(m_LuaState, LUA_REGISTRYINDEX, cmd->second); // same as lua_getref()
-
- // Push the split:
- lua_createtable(m_LuaState, a_Split.size(), 0);
- int newTable = lua_gettop(m_LuaState);
- int index = 1;
- std::vector<std::string>::const_iterator iter = a_Split.begin(), end = a_Split.end();
- while(iter != end)
- {
- tolua_pushstring(m_LuaState, (*iter).c_str());
- lua_rawseti(m_LuaState, newTable, index);
- ++iter;
- ++index;
+ if (!m_LuaState.PushFunctionFromRegistry(cmd->second))
+ {
+ LOGWARNING("Command handler function for \"%s\" is invalid", cmd->first.c_str());
+ return false;
}
- // Push player:
- tolua_pushusertype(m_LuaState, a_Player, "cPlayer");
+ m_LuaState.PushStringVector(a_Split);
+ m_LuaState.PushObject(a_Player);
// Call function:
- int s = lua_pcall(m_LuaState, 2, 1, 0);
- if (report_errors(m_LuaState, s))
+ if (!m_LuaState.CallFunction(1))
{
- LOGERROR("LUA error in %s. Stack size: %i", __FUNCTION__, lua_gettop(m_LuaState));
+ LOGWARNING("LUA error in %s. Stack size: %i", __FUNCTION__, lua_gettop(m_LuaState));
return false;
}
@@ -1420,26 +1335,14 @@ bool cPlugin_NewLua::HandleConsoleCommand(const AStringVector & a_Split, cComman
cCSLock Lock(m_CriticalSection);
// Push the function to be called:
- lua_rawgeti(m_LuaState, LUA_REGISTRYINDEX, cmd->second); // same as lua_getref()
+ m_LuaState.PushFunctionFromRegistry(cmd->second);
- // Push the split:
- lua_createtable(m_LuaState, a_Split.size(), 0);
- int newTable = lua_gettop(m_LuaState);
- int index = 1;
- std::vector<std::string>::const_iterator iter = a_Split.begin(), end = a_Split.end();
- while(iter != end)
- {
- tolua_pushstring(m_LuaState, (*iter).c_str());
- lua_rawseti(m_LuaState, newTable, index);
- ++iter;
- ++index;
- }
+ m_LuaState.PushStringVector(a_Split);
// Call function:
- int s = lua_pcall(m_LuaState, 1, 2, 0);
- if (report_errors(m_LuaState, s))
+ if (!m_LuaState.CallFunction(2))
{
- LOGERROR("Lua error. Stack size: %i", lua_gettop(m_LuaState));
+ LOGWARNING("Lua error in %s. Stack size: %i", __FUNCTION__, lua_gettop(m_LuaState));
return false;
}
@@ -1604,9 +1507,9 @@ AString cPlugin_NewLua::HandleWebRequest(const HTTPRequest * a_Request )
return "";
sWebPluginTab* Tab = 0;
- for( TabList::iterator itr = GetTabs().begin(); itr != GetTabs().end(); ++itr )
+ for (TabList::iterator itr = GetTabs().begin(); itr != GetTabs().end(); ++itr)
{
- if( (*itr)->SafeTitle.compare( SafeTabName ) == 0 ) // This is the one! Rawr
+ if ((*itr)->SafeTitle.compare(SafeTabName) == 0) // This is the one! Rawr
{
Tab = *itr;
break;
@@ -1615,34 +1518,26 @@ AString cPlugin_NewLua::HandleWebRequest(const HTTPRequest * a_Request )
if( Tab )
{
- //LOGINFO("1. Stack size: %i", lua_gettop(m_LuaState) );
- lua_rawgeti( m_LuaState, LUA_REGISTRYINDEX, Tab->UserData); // same as lua_getref()
+ m_LuaState.PushFunctionFromRegistry(Tab->UserData);
- //LOGINFO("2. Stack size: %i", lua_gettop(m_LuaState) );
// Push HTTPRequest
- tolua_pushusertype( m_LuaState, (void*)a_Request, "const HTTPRequest" );
- //LOGINFO("Calling bound function! :D");
- int s = lua_pcall( m_LuaState, 1, 1, 0);
-
- if ( s != 0 )
+ m_LuaState.PushUserType((void*)a_Request, "const HTTPRequest");
+
+ if (!m_LuaState.CallFunction(1))
{
- std::string err = lua_tostring(m_LuaState, -1);
- LOGERROR("-- %s", err.c_str() );
- lua_pop(m_LuaState, 1);
- LOGINFO("error. Stack size: %i", lua_gettop(m_LuaState) );
- return err; // Show the error message in the web page, looks cool
+ return "Lua encountered error while processing the page request";
}
- if( !lua_isstring( m_LuaState, -1 ) )
+ if (!lua_isstring(m_LuaState, -1))
{
- LOGWARN("WARNING: WebPlugin tab '%s' did not return a string!", Tab->Title.c_str() );
- lua_pop(m_LuaState, 1); // Pop return value
- return std::string("WARNING: WebPlugin tab '") + Tab->Title + std::string("' did not return a string!");
+ LOGWARNING("WebPlugin tab '%s' did not return a string!", Tab->Title.c_str());
+ lua_pop(m_LuaState, 1); // Pop return value
+ return Printf("WARNING: WebPlugin tab '%s' did not return a string!", Tab->Title.c_str());
}
RetVal += tolua_tostring(m_LuaState, -1, 0);
lua_pop(m_LuaState, 1); // Pop return value
- //LOGINFO("ok. Stack size: %i", lua_gettop(m_LuaState) );
+ // LOGINFO("ok. Stack size: %i", lua_gettop(m_LuaState) );
}
return RetVal;
@@ -1652,7 +1547,7 @@ AString cPlugin_NewLua::HandleWebRequest(const HTTPRequest * a_Request )
-bool cPlugin_NewLua::AddWebTab( const AString & a_Title, lua_State * a_LuaState, int a_FunctionReference )
+bool cPlugin_NewLua::AddWebTab(const AString & a_Title, lua_State * a_LuaState, int a_FunctionReference)
{
cCSLock Lock(m_CriticalSection);
if (a_LuaState != m_LuaState)
@@ -1666,7 +1561,7 @@ bool cPlugin_NewLua::AddWebTab( const AString & a_Title, lua_State * a_LuaState,
Tab->UserData = a_FunctionReference;
- GetTabs().push_back( Tab );
+ GetTabs().push_back(Tab);
return true;
}
@@ -1709,16 +1604,15 @@ bool cPlugin_NewLua::CallbackWindowClosing(int a_FnRef, cWindow & a_Window, cPla
ASSERT(a_FnRef != LUA_REFNIL);
cCSLock Lock(m_CriticalSection);
- lua_rawgeti(m_LuaState, LUA_REGISTRYINDEX, a_FnRef); // Push the function to be called
- tolua_pushusertype(m_LuaState, &a_Window, "cWindow");
- tolua_pushusertype(m_LuaState, &a_Player, "cPlayer");
- tolua_pushboolean (m_LuaState, a_CanRefuse ? 1 : 0);
+ m_LuaState.PushFunctionFromRegistry(a_FnRef);
+ m_LuaState.PushUserType(&a_Window, "cWindow");
+ m_LuaState.PushObject(&a_Player);
+ m_LuaState.PushBool(a_CanRefuse);
// Call function:
- int s = lua_pcall(m_LuaState, 3, 1, 0);
- if (report_errors(m_LuaState, s))
+ if (!m_LuaState.CallFunction(1))
{
- LOGERROR("LUA error in %s. Stack size: %i", __FUNCTION__, lua_gettop(m_LuaState));
+ LOGWARNING("LUA error in %s. Stack size: %i", __FUNCTION__, lua_gettop(m_LuaState));
return false;
}
@@ -1736,59 +1630,15 @@ void cPlugin_NewLua::CallbackWindowSlotChanged(int a_FnRef, cWindow & a_Window,
ASSERT(a_FnRef != LUA_REFNIL);
cCSLock Lock(m_CriticalSection);
- lua_rawgeti(m_LuaState, LUA_REGISTRYINDEX, a_FnRef); // Push the function to be called
- tolua_pushusertype(m_LuaState, &a_Window, "cWindow");
- tolua_pushnumber (m_LuaState, a_SlotNum);
+ m_LuaState.PushFunctionFromRegistry(a_FnRef);
+ m_LuaState.PushUserType(&a_Window, "cWindow");
+ m_LuaState.PushNumber(a_SlotNum);
// Call function:
- int s = lua_pcall(m_LuaState, 2, 0, 0);
- if (report_errors(m_LuaState, s))
- {
- LOGERROR("LUA error in %s. Stack size: %i", __FUNCTION__, lua_gettop(m_LuaState));
- }
-}
-
-
-
-
-
-// Helper functions
-bool cPlugin_NewLua::PushFunction(const char * a_FunctionName, bool a_bLogError /* = true */)
-{
- if (m_LuaState == NULL)
+ if (!m_LuaState.CallFunction(0))
{
- // This happens if Initialize() fails with an error
- return false;
+ LOGWARNING("LUA error in %s. Stack size: %i", __FUNCTION__, lua_gettop(m_LuaState));
}
-
- lua_getglobal(m_LuaState, a_FunctionName);
- if (!lua_isfunction(m_LuaState, -1))
- {
- if (a_bLogError)
- {
- LOGWARN("Error in plugin %s: Could not find function %s()", GetName().c_str(), a_FunctionName);
- }
- lua_pop(m_LuaState, 1);
- return false;
- }
- return true;
-}
-
-
-
-
-
-bool cPlugin_NewLua::CallFunction( int a_NumArgs, int a_NumResults, const char * a_FunctionName)
-{
- ASSERT(lua_isfunction(m_LuaState, -a_NumArgs - 1));
-
- int s = lua_pcall(m_LuaState, a_NumArgs, a_NumResults, 0);
- if (report_errors(m_LuaState, s))
- {
- LOGWARN("Error in plugin %s calling function %s()", GetName().c_str(), a_FunctionName);
- return false;
- }
- return true;
}