Finished renaming cPlugin_NewLua to cPluginLua.
This commit is contained in:
madmaxoft
parent
dd030fa892
commit
493100bdb0
@ -1,6 +1,6 @@
|
||||
/*
|
||||
** Lua binding: AllToLua
|
||||
** Generated automatically by tolua++-1.0.92 on 08/18/13 22:18:01.
|
||||
** Generated automatically by tolua++-1.0.92 on 08/19/13 09:36:55.
|
||||
*/
|
||||
|
||||
#ifndef __cplusplus
|
||||
@ -210,7 +210,7 @@ static void tolua_reg_types (lua_State* tolua_S)
|
||||
tolua_usertype(tolua_S,"cBlockArea");
|
||||
tolua_usertype(tolua_S,"cEnchantments");
|
||||
tolua_usertype(tolua_S,"cLuaWindow");
|
||||
tolua_usertype(tolua_S,"cInventory");
|
||||
tolua_usertype(tolua_S,"cServer");
|
||||
tolua_usertype(tolua_S,"cRoot");
|
||||
tolua_usertype(tolua_S,"cDropperEntity");
|
||||
tolua_usertype(tolua_S,"std::vector<cIniFile::key>");
|
||||
@ -227,7 +227,7 @@ static void tolua_reg_types (lua_State* tolua_S)
|
||||
tolua_usertype(tolua_S,"cTracer");
|
||||
tolua_usertype(tolua_S,"cCuboid");
|
||||
tolua_usertype(tolua_S,"Vector3i");
|
||||
tolua_usertype(tolua_S,"cPlugin_NewLua");
|
||||
tolua_usertype(tolua_S,"cInventory");
|
||||
tolua_usertype(tolua_S,"cItem");
|
||||
tolua_usertype(tolua_S,"Vector3f");
|
||||
tolua_usertype(tolua_S,"cCraftingRecipes");
|
||||
@ -255,7 +255,7 @@ static void tolua_reg_types (lua_State* tolua_S)
|
||||
tolua_usertype(tolua_S,"cBlockEntityWindowOwner");
|
||||
tolua_usertype(tolua_S,"cEntity");
|
||||
tolua_usertype(tolua_S,"cItemGrid::cListener");
|
||||
tolua_usertype(tolua_S,"cServer");
|
||||
tolua_usertype(tolua_S,"cPluginLua");
|
||||
tolua_usertype(tolua_S,"cItems");
|
||||
tolua_usertype(tolua_S,"Vector3d");
|
||||
}
|
||||
@ -9818,11 +9818,11 @@ static int tolua_AllToLua_cPlugin_GetLocalDirectory00(lua_State* tolua_S)
|
||||
}
|
||||
#endif //#ifndef TOLUA_DISABLE
|
||||
|
||||
/* get function: __cWebPlugin__ of class cPlugin_NewLua */
|
||||
#ifndef TOLUA_DISABLE_tolua_get_cPlugin_NewLua___cWebPlugin__
|
||||
static int tolua_get_cPlugin_NewLua___cWebPlugin__(lua_State* tolua_S)
|
||||
/* get function: __cWebPlugin__ of class cPluginLua */
|
||||
#ifndef TOLUA_DISABLE_tolua_get_cPluginLua___cWebPlugin__
|
||||
static int tolua_get_cPluginLua___cWebPlugin__(lua_State* tolua_S)
|
||||
{
|
||||
cPlugin_NewLua* self = (cPlugin_NewLua*) tolua_tousertype(tolua_S,1,0);
|
||||
cPluginLua* self = (cPluginLua*) tolua_tousertype(tolua_S,1,0);
|
||||
#ifndef TOLUA_RELEASE
|
||||
if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable '__cWebPlugin__'",NULL);
|
||||
#endif
|
||||
@ -27975,6 +27975,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
|
||||
tolua_constant(tolua_S,"HOOK_UPDATING_SIGN",cPluginManager::HOOK_UPDATING_SIGN);
|
||||
tolua_constant(tolua_S,"HOOK_WEATHER_CHANGED",cPluginManager::HOOK_WEATHER_CHANGED);
|
||||
tolua_constant(tolua_S,"HOOK_WEATHER_CHANGING",cPluginManager::HOOK_WEATHER_CHANGING);
|
||||
tolua_constant(tolua_S,"HOOK_WORLD_TICK",cPluginManager::HOOK_WORLD_TICK);
|
||||
tolua_function(tolua_S,"Get",tolua_AllToLua_cPluginManager_Get00);
|
||||
tolua_function(tolua_S,"GetPlugin",tolua_AllToLua_cPluginManager_GetPlugin00);
|
||||
tolua_function(tolua_S,"FindPlugins",tolua_AllToLua_cPluginManager_FindPlugins00);
|
||||
@ -27998,9 +27999,9 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
|
||||
tolua_function(tolua_S,"GetDirectory",tolua_AllToLua_cPlugin_GetDirectory00);
|
||||
tolua_function(tolua_S,"GetLocalDirectory",tolua_AllToLua_cPlugin_GetLocalDirectory00);
|
||||
tolua_endmodule(tolua_S);
|
||||
tolua_cclass(tolua_S,"cPlugin_NewLua","cPlugin_NewLua","cPlugin",NULL);
|
||||
tolua_beginmodule(tolua_S,"cPlugin_NewLua");
|
||||
tolua_variable(tolua_S,"__cWebPlugin__",tolua_get_cPlugin_NewLua___cWebPlugin__,NULL);
|
||||
tolua_cclass(tolua_S,"cPluginLua","cPluginLua","cPlugin",NULL);
|
||||
tolua_beginmodule(tolua_S,"cPluginLua");
|
||||
tolua_variable(tolua_S,"__cWebPlugin__",tolua_get_cPluginLua___cWebPlugin__,NULL);
|
||||
tolua_endmodule(tolua_S);
|
||||
tolua_cclass(tolua_S,"cServer","cServer","",NULL);
|
||||
tolua_beginmodule(tolua_S,"cServer");
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/*
|
||||
** Lua binding: AllToLua
|
||||
** Generated automatically by tolua++-1.0.92 on 08/18/13 22:18:02.
|
||||
** Generated automatically by tolua++-1.0.92 on 08/19/13 09:36:55.
|
||||
*/
|
||||
|
||||
/* Exported function */
|
||||
|
||||
@ -552,11 +552,11 @@ void cLuaState::Push(cWindow * a_Window)
|
||||
|
||||
|
||||
|
||||
void cLuaState::Push(cPlugin_NewLua * a_Plugin)
|
||||
void cLuaState::Push(cPluginLua * a_Plugin)
|
||||
{
|
||||
ASSERT(IsValid());
|
||||
|
||||
tolua_pushusertype(m_LuaState, a_Plugin, "cPlugin_NewLua");
|
||||
tolua_pushusertype(m_LuaState, a_Plugin, "cPluginLua");
|
||||
m_NumCurrentFunctionArgs += 1;
|
||||
}
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ class cCraftingGrid;
|
||||
class cCraftingRecipe;
|
||||
struct TakeDamageInfo;
|
||||
class cWindow;
|
||||
class cPlugin_NewLua;
|
||||
class cPluginLua;
|
||||
struct HTTPRequest;
|
||||
class cWebAdmin;
|
||||
struct HTTPTemplateRequest;
|
||||
@ -172,7 +172,7 @@ public:
|
||||
void Push(const cCraftingRecipe * a_Recipe);
|
||||
void Push(TakeDamageInfo * a_TDI);
|
||||
void Push(cWindow * a_Window);
|
||||
void Push(cPlugin_NewLua * a_Plugin);
|
||||
void Push(cPluginLua * a_Plugin);
|
||||
void Push(const HTTPRequest * a_Request);
|
||||
void Push(cWebAdmin * a_WebAdmin);
|
||||
void Push(const HTTPTemplateRequest * a_Request);
|
||||
|
||||
@ -65,7 +65,7 @@ cLuaWindow::~cLuaWindow()
|
||||
|
||||
|
||||
|
||||
void cLuaWindow::SetLuaRef(cPlugin_NewLua * a_Plugin, int a_LuaRef)
|
||||
void cLuaWindow::SetLuaRef(cPluginLua * a_Plugin, int a_LuaRef)
|
||||
{
|
||||
// Either m_Plugin is not set or equal to the passed plugin; only one plugin can use one cLuaWindow object
|
||||
ASSERT((m_Plugin == NULL) || (m_Plugin == a_Plugin));
|
||||
@ -87,7 +87,7 @@ bool cLuaWindow::IsLuaReferenced(void) const
|
||||
|
||||
|
||||
|
||||
void cLuaWindow::SetOnClosing(cPlugin_NewLua * a_Plugin, int a_FnRef)
|
||||
void cLuaWindow::SetOnClosing(cPluginLua * a_Plugin, int a_FnRef)
|
||||
{
|
||||
// Either m_Plugin is not set or equal to the passed plugin; only one plugin can use one cLuaWindow object
|
||||
ASSERT((m_Plugin == NULL) || (m_Plugin == a_Plugin));
|
||||
@ -107,7 +107,7 @@ void cLuaWindow::SetOnClosing(cPlugin_NewLua * a_Plugin, int a_FnRef)
|
||||
|
||||
|
||||
|
||||
void cLuaWindow::SetOnSlotChanged(cPlugin_NewLua * a_Plugin, int a_FnRef)
|
||||
void cLuaWindow::SetOnSlotChanged(cPluginLua * a_Plugin, int a_FnRef)
|
||||
{
|
||||
// Either m_Plugin is not set or equal to the passed plugin; only one plugin can use one cLuaWindow object
|
||||
ASSERT((m_Plugin == NULL) || (m_Plugin == a_Plugin));
|
||||
|
||||
@ -16,8 +16,8 @@
|
||||
|
||||
|
||||
|
||||
// fwd: Plugin_NewLua.h
|
||||
class cPlugin_NewLua;
|
||||
// fwd: PluginLua.h
|
||||
class cPluginLua;
|
||||
|
||||
|
||||
|
||||
@ -55,23 +55,23 @@ public:
|
||||
/** Sets the plugin reference and the internal Lua object reference index
|
||||
used for preventing Lua's GC to collect this class while the window is open
|
||||
*/
|
||||
void SetLuaRef(cPlugin_NewLua * a_Plugin, int a_LuaRef);
|
||||
void SetLuaRef(cPluginLua * a_Plugin, int a_LuaRef);
|
||||
|
||||
/// Returns true if SetLuaRef() has been called
|
||||
bool IsLuaReferenced(void) const;
|
||||
|
||||
/// Sets the callback function (Lua reference) to call when the window is about to close
|
||||
void SetOnClosing(cPlugin_NewLua * a_Plugin, int a_FnRef);
|
||||
void SetOnClosing(cPluginLua * a_Plugin, int a_FnRef);
|
||||
|
||||
/// Sets the callback function (Lua reference) to call when a slot is changed
|
||||
void SetOnSlotChanged(cPlugin_NewLua * a_Plugin, int a_FnRef);
|
||||
void SetOnSlotChanged(cPluginLua * a_Plugin, int a_FnRef);
|
||||
|
||||
protected:
|
||||
/// Contents of the non-inventory part
|
||||
cItemGrid m_Contents;
|
||||
|
||||
/// The plugin that has opened the window and owns the m_LuaRef
|
||||
cPlugin_NewLua * m_Plugin;
|
||||
cPluginLua * m_Plugin;
|
||||
|
||||
/// The Lua object reference, used for keeping the object alive as long as any player has the window open
|
||||
int m_LuaRef;
|
||||
|
||||
@ -136,7 +136,7 @@ static int tolua_LOGERROR(lua_State* tolua_S)
|
||||
|
||||
|
||||
|
||||
cPlugin_NewLua * GetLuaPlugin(lua_State * L)
|
||||
cPluginLua * GetLuaPlugin(lua_State * L)
|
||||
{
|
||||
// Get the plugin identification out of LuaState:
|
||||
lua_getglobal(L, LUA_PLUGIN_INSTANCE_VAR_NAME);
|
||||
@ -146,7 +146,7 @@ cPlugin_NewLua * GetLuaPlugin(lua_State * L)
|
||||
lua_pop(L, 1);
|
||||
return NULL;
|
||||
}
|
||||
cPlugin_NewLua * Plugin = (cPlugin_NewLua *)lua_topointer(L, -1);
|
||||
cPluginLua * Plugin = (cPluginLua *)lua_topointer(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
return Plugin;
|
||||
@ -907,7 +907,7 @@ static int tolua_cPluginManager_ForEachConsoleCommand(lua_State * tolua_S)
|
||||
static int tolua_cPluginManager_BindCommand(lua_State * L)
|
||||
{
|
||||
// Function signature: cPluginManager:BindCommand(Command, Permission, Function, HelpString)
|
||||
cPlugin_NewLua * Plugin = GetLuaPlugin(L);
|
||||
cPluginLua * Plugin = GetLuaPlugin(L);
|
||||
if (Plugin == NULL)
|
||||
{
|
||||
return 0;
|
||||
@ -969,7 +969,7 @@ static int tolua_cPluginManager_BindConsoleCommand(lua_State * L)
|
||||
{
|
||||
LOGERROR("cPluginManager:BindConsoleCommand() cannot get plugin instance, what have you done to my Lua state? Command-binding aborted.");
|
||||
}
|
||||
cPlugin_NewLua * Plugin = (cPlugin_NewLua *)lua_topointer(L, -1);
|
||||
cPluginLua * Plugin = (cPluginLua *)lua_topointer(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
// Read the arguments to this API call:
|
||||
@ -1071,7 +1071,7 @@ static int tolua_cPlayer_OpenWindow(lua_State * tolua_S)
|
||||
// Function signature: cPlayer:OpenWindow(Window)
|
||||
|
||||
// Retrieve the plugin instance from the Lua state
|
||||
cPlugin_NewLua * Plugin = GetLuaPlugin(tolua_S);
|
||||
cPluginLua * Plugin = GetLuaPlugin(tolua_S);
|
||||
if (Plugin == NULL)
|
||||
{
|
||||
return 0;
|
||||
@ -1117,14 +1117,14 @@ static int tolua_cPlayer_OpenWindow(lua_State * tolua_S)
|
||||
|
||||
template <
|
||||
class OBJTYPE,
|
||||
void (OBJTYPE::*SetCallback)(cPlugin_NewLua * a_Plugin, int a_FnRef)
|
||||
void (OBJTYPE::*SetCallback)(cPluginLua * a_Plugin, int a_FnRef)
|
||||
>
|
||||
static int tolua_SetObjectCallback(lua_State * tolua_S)
|
||||
{
|
||||
// Function signature: OBJTYPE:SetWhateverCallback(CallbackFunction)
|
||||
|
||||
// Retrieve the plugin instance from the Lua state
|
||||
cPlugin_NewLua * Plugin = GetLuaPlugin(tolua_S);
|
||||
cPluginLua * Plugin = GetLuaPlugin(tolua_S);
|
||||
if (Plugin == NULL)
|
||||
{
|
||||
// Warning message has already been printed by GetLuaPlugin(), bail out silently
|
||||
@ -1154,9 +1154,9 @@ static int tolua_SetObjectCallback(lua_State * tolua_S)
|
||||
|
||||
|
||||
|
||||
static int tolua_cPlugin_NewLua_AddWebTab(lua_State * tolua_S)
|
||||
static int tolua_cPluginLua_AddWebTab(lua_State * tolua_S)
|
||||
{
|
||||
cPlugin_NewLua * self = (cPlugin_NewLua*)tolua_tousertype(tolua_S,1,0);
|
||||
cPluginLua * self = (cPluginLua *)tolua_tousertype(tolua_S,1,0);
|
||||
|
||||
tolua_Error tolua_err;
|
||||
tolua_err.array = 0;
|
||||
@ -1186,7 +1186,7 @@ static int tolua_cPlugin_NewLua_AddWebTab(lua_State * tolua_S)
|
||||
}
|
||||
else
|
||||
{
|
||||
LOGERROR("ERROR: cPlugin_NewLua:AddWebTab invalid function reference in 2nd argument (Title: \"%s\")", Title.c_str() );
|
||||
LOGERROR("ERROR: cPluginLua:AddWebTab invalid function reference in 2nd argument (Title: \"%s\")", Title.c_str() );
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -1196,13 +1196,13 @@ static int tolua_cPlugin_NewLua_AddWebTab(lua_State * tolua_S)
|
||||
|
||||
|
||||
|
||||
static int tolua_cPlugin_NewLua_AddTab(lua_State* tolua_S)
|
||||
static int tolua_cPluginLua_AddTab(lua_State* tolua_S)
|
||||
{
|
||||
cPlugin_NewLua * self = (cPlugin_NewLua *) tolua_tousertype(tolua_S, 1, 0);
|
||||
cPluginLua * self = (cPluginLua *) tolua_tousertype(tolua_S, 1, 0);
|
||||
LOGWARN("WARNING: Using deprecated function AddTab()! Use AddWebTab() instead. (plugin \"%s\" in folder \"%s\")",
|
||||
self->GetName().c_str(), self->GetDirectory().c_str()
|
||||
);
|
||||
return tolua_cPlugin_NewLua_AddWebTab( tolua_S );
|
||||
return tolua_cPluginLua_AddWebTab( tolua_S );
|
||||
}
|
||||
|
||||
|
||||
@ -1271,7 +1271,7 @@ static int copy_lua_values(lua_State * a_Source, lua_State * a_Destination, int
|
||||
|
||||
static int tolua_cPlugin_Call(lua_State* tolua_S)
|
||||
{
|
||||
cPlugin_NewLua * self = (cPlugin_NewLua *) tolua_tousertype(tolua_S, 1, 0);
|
||||
cPluginLua * self = (cPluginLua *) tolua_tousertype(tolua_S, 1, 0);
|
||||
lua_State* targetState = self->GetLuaState();
|
||||
int targetTop = lua_gettop(targetState);
|
||||
|
||||
@ -1712,9 +1712,9 @@ void ManualBindings::Bind(lua_State * tolua_S)
|
||||
tolua_function(tolua_S, "SetOnSlotChanged", tolua_SetObjectCallback<cLuaWindow, &cLuaWindow::SetOnSlotChanged>);
|
||||
tolua_endmodule(tolua_S);
|
||||
|
||||
tolua_beginmodule(tolua_S, "cPlugin_NewLua");
|
||||
tolua_function(tolua_S, "AddTab", tolua_cPlugin_NewLua_AddTab);
|
||||
tolua_function(tolua_S, "AddWebTab", tolua_cPlugin_NewLua_AddWebTab);
|
||||
tolua_beginmodule(tolua_S, "cPluginLua");
|
||||
tolua_function(tolua_S, "AddTab", tolua_cPluginLua_AddTab);
|
||||
tolua_function(tolua_S, "AddWebTab", tolua_cPluginLua_AddWebTab);
|
||||
tolua_endmodule(tolua_S);
|
||||
|
||||
tolua_cclass(tolua_S,"HTTPRequest","HTTPRequest","",NULL);
|
||||
|
||||
@ -21,9 +21,9 @@ extern "C"
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// cPlugin_NewLua:
|
||||
// cPluginLua:
|
||||
|
||||
cPlugin_NewLua::cPlugin_NewLua(const AString & a_PluginDirectory) :
|
||||
cPluginLua::cPluginLua(const AString & a_PluginDirectory) :
|
||||
cPlugin(a_PluginDirectory),
|
||||
m_LuaState(Printf("plugin %s", a_PluginDirectory.c_str()))
|
||||
{
|
||||
@ -33,7 +33,7 @@ cPlugin_NewLua::cPlugin_NewLua(const AString & a_PluginDirectory) :
|
||||
|
||||
|
||||
|
||||
cPlugin_NewLua::~cPlugin_NewLua()
|
||||
cPluginLua::~cPluginLua()
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
m_LuaState.Close();
|
||||
@ -43,7 +43,7 @@ cPlugin_NewLua::~cPlugin_NewLua()
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::Initialize(void)
|
||||
bool cPluginLua::Initialize(void)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
if (!m_LuaState.IsValid())
|
||||
@ -98,7 +98,7 @@ bool cPlugin_NewLua::Initialize(void)
|
||||
|
||||
|
||||
|
||||
void cPlugin_NewLua::OnDisable(void)
|
||||
void cPluginLua::OnDisable(void)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
if (!m_LuaState.HasFunction("OnDisable"))
|
||||
@ -112,7 +112,7 @@ void cPlugin_NewLua::OnDisable(void)
|
||||
|
||||
|
||||
|
||||
void cPlugin_NewLua::Tick(float a_Dt)
|
||||
void cPluginLua::Tick(float a_Dt)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
m_LuaState.Call(GetHookFnName(cPluginManager::HOOK_TICK), a_Dt);
|
||||
@ -122,7 +122,7 @@ void cPlugin_NewLua::Tick(float a_Dt)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnBlockToPickups(cWorld * a_World, cEntity * a_Digger, int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cItems & a_Pickups)
|
||||
bool cPluginLua::OnBlockToPickups(cWorld * a_World, cEntity * a_Digger, int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cItems & a_Pickups)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -134,7 +134,7 @@ bool cPlugin_NewLua::OnBlockToPickups(cWorld * a_World, cEntity * a_Digger, int
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnChat(cPlayer * a_Player, AString & a_Message)
|
||||
bool cPluginLua::OnChat(cPlayer * a_Player, AString & a_Message)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -146,7 +146,7 @@ bool cPlugin_NewLua::OnChat(cPlayer * a_Player, AString & a_Message)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnChunkAvailable(cWorld * a_World, int a_ChunkX, int a_ChunkZ)
|
||||
bool cPluginLua::OnChunkAvailable(cWorld * a_World, int a_ChunkX, int a_ChunkZ)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -158,7 +158,7 @@ bool cPlugin_NewLua::OnChunkAvailable(cWorld * a_World, int a_ChunkX, int a_Chun
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnChunkGenerated(cWorld * a_World, int a_ChunkX, int a_ChunkZ, cChunkDesc * a_ChunkDesc)
|
||||
bool cPluginLua::OnChunkGenerated(cWorld * a_World, int a_ChunkX, int a_ChunkZ, cChunkDesc * a_ChunkDesc)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -170,7 +170,7 @@ 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_ChunkDesc)
|
||||
bool cPluginLua::OnChunkGenerating(cWorld * a_World, int a_ChunkX, int a_ChunkZ, cChunkDesc * a_ChunkDesc)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -182,7 +182,7 @@ bool cPlugin_NewLua::OnChunkGenerating(cWorld * a_World, int a_ChunkX, int a_Chu
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnChunkUnloaded(cWorld * a_World, int a_ChunkX, int a_ChunkZ)
|
||||
bool cPluginLua::OnChunkUnloaded(cWorld * a_World, int a_ChunkX, int a_ChunkZ)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -194,7 +194,7 @@ bool cPlugin_NewLua::OnChunkUnloaded(cWorld * a_World, int a_ChunkX, int a_Chunk
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnChunkUnloading(cWorld * a_World, int a_ChunkX, int a_ChunkZ)
|
||||
bool cPluginLua::OnChunkUnloading(cWorld * a_World, int a_ChunkX, int a_ChunkZ)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -206,7 +206,7 @@ bool cPlugin_NewLua::OnChunkUnloading(cWorld * a_World, int a_ChunkX, int a_Chun
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnCollectingPickup(cPlayer * a_Player, cPickup * a_Pickup)
|
||||
bool cPluginLua::OnCollectingPickup(cPlayer * a_Player, cPickup * a_Pickup)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -218,7 +218,7 @@ bool cPlugin_NewLua::OnCollectingPickup(cPlayer * a_Player, cPickup * a_Pickup)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnCraftingNoRecipe(const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe)
|
||||
bool cPluginLua::OnCraftingNoRecipe(const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -230,7 +230,7 @@ bool cPlugin_NewLua::OnCraftingNoRecipe(const cPlayer * a_Player, const cCraftin
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnDisconnect(cPlayer * a_Player, const AString & a_Reason)
|
||||
bool cPluginLua::OnDisconnect(cPlayer * a_Player, const AString & a_Reason)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -242,7 +242,7 @@ bool cPlugin_NewLua::OnDisconnect(cPlayer * a_Player, const AString & a_Reason)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnExecuteCommand(cPlayer * a_Player, const AStringVector & a_Split)
|
||||
bool cPluginLua::OnExecuteCommand(cPlayer * a_Player, const AStringVector & a_Split)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -254,7 +254,7 @@ bool cPlugin_NewLua::OnExecuteCommand(cPlayer * a_Player, const AStringVector &
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnExploded(cWorld & a_World, double a_ExplosionSize, bool a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData)
|
||||
bool cPluginLua::OnExploded(cWorld & a_World, double a_ExplosionSize, bool a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -284,7 +284,7 @@ bool cPlugin_NewLua::OnExploded(cWorld & a_World, double a_ExplosionSize, bool a
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnExploding(cWorld & a_World, double & a_ExplosionSize, bool & a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData)
|
||||
bool cPluginLua::OnExploding(cWorld & a_World, double & a_ExplosionSize, bool & a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -314,7 +314,7 @@ bool cPlugin_NewLua::OnExploding(cWorld & a_World, double & a_ExplosionSize, boo
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnHandshake(cClientHandle * a_Client, const AString & a_Username)
|
||||
bool cPluginLua::OnHandshake(cClientHandle * a_Client, const AString & a_Username)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -326,7 +326,7 @@ bool cPlugin_NewLua::OnHandshake(cClientHandle * a_Client, const AString & a_Use
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnHopperPullingItem(cWorld & a_World, cHopperEntity & a_Hopper, int a_DstSlotNum, cBlockEntityWithItems & a_SrcEntity, int a_SrcSlotNum)
|
||||
bool cPluginLua::OnHopperPullingItem(cWorld & a_World, cHopperEntity & a_Hopper, int a_DstSlotNum, cBlockEntityWithItems & a_SrcEntity, int a_SrcSlotNum)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -338,7 +338,7 @@ bool cPlugin_NewLua::OnHopperPullingItem(cWorld & a_World, cHopperEntity & a_Hop
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnHopperPushingItem(cWorld & a_World, cHopperEntity & a_Hopper, int a_SrcSlotNum, cBlockEntityWithItems & a_DstEntity, int a_DstSlotNum)
|
||||
bool cPluginLua::OnHopperPushingItem(cWorld & a_World, cHopperEntity & a_Hopper, int a_SrcSlotNum, cBlockEntityWithItems & a_DstEntity, int a_DstSlotNum)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -350,7 +350,7 @@ bool cPlugin_NewLua::OnHopperPushingItem(cWorld & a_World, cHopperEntity & a_Hop
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnKilling(cEntity & a_Victim, cEntity * a_Killer)
|
||||
bool cPluginLua::OnKilling(cEntity & a_Victim, cEntity * a_Killer)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -362,7 +362,7 @@ bool cPlugin_NewLua::OnKilling(cEntity & a_Victim, cEntity * a_Killer)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnLogin(cClientHandle * a_Client, int a_ProtocolVersion, const AString & a_Username)
|
||||
bool cPluginLua::OnLogin(cClientHandle * a_Client, int a_ProtocolVersion, const AString & a_Username)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -374,7 +374,7 @@ bool cPlugin_NewLua::OnLogin(cClientHandle * a_Client, int a_ProtocolVersion, co
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerAnimation(cPlayer & a_Player, int a_Animation)
|
||||
bool cPluginLua::OnPlayerAnimation(cPlayer & a_Player, int a_Animation)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -386,7 +386,7 @@ bool cPlugin_NewLua::OnPlayerAnimation(cPlayer & a_Player, int a_Animation)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerBreakingBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
bool cPluginLua::OnPlayerBreakingBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -398,7 +398,7 @@ bool cPlugin_NewLua::OnPlayerBreakingBlock(cPlayer & a_Player, int a_BlockX, int
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerBrokenBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
bool cPluginLua::OnPlayerBrokenBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -410,7 +410,7 @@ bool cPlugin_NewLua::OnPlayerBrokenBlock(cPlayer & a_Player, int a_BlockX, int a
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerEating(cPlayer & a_Player)
|
||||
bool cPluginLua::OnPlayerEating(cPlayer & a_Player)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -422,7 +422,7 @@ bool cPlugin_NewLua::OnPlayerEating(cPlayer & a_Player)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerJoined(cPlayer & a_Player)
|
||||
bool cPluginLua::OnPlayerJoined(cPlayer & a_Player)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -434,7 +434,7 @@ bool cPlugin_NewLua::OnPlayerJoined(cPlayer & a_Player)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerLeftClick(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, char a_Status)
|
||||
bool cPluginLua::OnPlayerLeftClick(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, char a_Status)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -446,7 +446,7 @@ bool cPlugin_NewLua::OnPlayerLeftClick(cPlayer & a_Player, int a_BlockX, int a_B
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerMoved(cPlayer & a_Player)
|
||||
bool cPluginLua::OnPlayerMoved(cPlayer & a_Player)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -458,7 +458,7 @@ bool cPlugin_NewLua::OnPlayerMoved(cPlayer & a_Player)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerPlacedBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
bool cPluginLua::OnPlayerPlacedBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -470,7 +470,7 @@ bool cPlugin_NewLua::OnPlayerPlacedBlock(cPlayer & a_Player, int a_BlockX, int a
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerPlacingBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
bool cPluginLua::OnPlayerPlacingBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -482,7 +482,7 @@ bool cPlugin_NewLua::OnPlayerPlacingBlock(cPlayer & a_Player, int a_BlockX, int
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerRightClick(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ)
|
||||
bool cPluginLua::OnPlayerRightClick(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -494,7 +494,7 @@ bool cPlugin_NewLua::OnPlayerRightClick(cPlayer & a_Player, int a_BlockX, int a_
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerRightClickingEntity(cPlayer & a_Player, cEntity & a_Entity)
|
||||
bool cPluginLua::OnPlayerRightClickingEntity(cPlayer & a_Player, cEntity & a_Entity)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -506,7 +506,7 @@ bool cPlugin_NewLua::OnPlayerRightClickingEntity(cPlayer & a_Player, cEntity & a
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerShooting(cPlayer & a_Player)
|
||||
bool cPluginLua::OnPlayerShooting(cPlayer & a_Player)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -518,7 +518,7 @@ bool cPlugin_NewLua::OnPlayerShooting(cPlayer & a_Player)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerSpawned(cPlayer & a_Player)
|
||||
bool cPluginLua::OnPlayerSpawned(cPlayer & a_Player)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -530,7 +530,7 @@ bool cPlugin_NewLua::OnPlayerSpawned(cPlayer & a_Player)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerTossingItem(cPlayer & a_Player)
|
||||
bool cPluginLua::OnPlayerTossingItem(cPlayer & a_Player)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -542,7 +542,7 @@ bool cPlugin_NewLua::OnPlayerTossingItem(cPlayer & a_Player)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerUsedBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
bool cPluginLua::OnPlayerUsedBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -554,7 +554,7 @@ bool cPlugin_NewLua::OnPlayerUsedBlock(cPlayer & a_Player, int a_BlockX, int a_B
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerUsedItem(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ)
|
||||
bool cPluginLua::OnPlayerUsedItem(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -566,7 +566,7 @@ bool cPlugin_NewLua::OnPlayerUsedItem(cPlayer & a_Player, int a_BlockX, int a_Bl
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerUsingBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
bool cPluginLua::OnPlayerUsingBlock(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -578,7 +578,7 @@ bool cPlugin_NewLua::OnPlayerUsingBlock(cPlayer & a_Player, int a_BlockX, int a_
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPlayerUsingItem(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ)
|
||||
bool cPluginLua::OnPlayerUsingItem(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -590,7 +590,7 @@ bool cPlugin_NewLua::OnPlayerUsingItem(cPlayer & a_Player, int a_BlockX, int a_B
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPostCrafting(const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe)
|
||||
bool cPluginLua::OnPostCrafting(const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -602,7 +602,7 @@ bool cPlugin_NewLua::OnPostCrafting(const cPlayer * a_Player, const cCraftingGri
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnPreCrafting(const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe)
|
||||
bool cPluginLua::OnPreCrafting(const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -614,7 +614,7 @@ bool cPlugin_NewLua::OnPreCrafting(const cPlayer * a_Player, const cCraftingGrid
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnSpawnedEntity(cWorld & a_World, cEntity & a_Entity)
|
||||
bool cPluginLua::OnSpawnedEntity(cWorld & a_World, cEntity & a_Entity)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -626,7 +626,7 @@ bool cPlugin_NewLua::OnSpawnedEntity(cWorld & a_World, cEntity & a_Entity)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnSpawnedMonster(cWorld & a_World, cMonster & a_Monster)
|
||||
bool cPluginLua::OnSpawnedMonster(cWorld & a_World, cMonster & a_Monster)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -638,7 +638,7 @@ bool cPlugin_NewLua::OnSpawnedMonster(cWorld & a_World, cMonster & a_Monster)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnSpawningEntity(cWorld & a_World, cEntity & a_Entity)
|
||||
bool cPluginLua::OnSpawningEntity(cWorld & a_World, cEntity & a_Entity)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -650,7 +650,7 @@ bool cPlugin_NewLua::OnSpawningEntity(cWorld & a_World, cEntity & a_Entity)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnSpawningMonster(cWorld & a_World, cMonster & a_Monster)
|
||||
bool cPluginLua::OnSpawningMonster(cWorld & a_World, cMonster & a_Monster)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -662,7 +662,7 @@ bool cPlugin_NewLua::OnSpawningMonster(cWorld & a_World, cMonster & a_Monster)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnTakeDamage(cEntity & a_Receiver, TakeDamageInfo & a_TDI)
|
||||
bool cPluginLua::OnTakeDamage(cEntity & a_Receiver, TakeDamageInfo & a_TDI)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -674,7 +674,7 @@ bool cPlugin_NewLua::OnTakeDamage(cEntity & a_Receiver, TakeDamageInfo & a_TDI)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnUpdatedSign(
|
||||
bool cPluginLua::OnUpdatedSign(
|
||||
cWorld * a_World,
|
||||
int a_BlockX, int a_BlockY, int a_BlockZ,
|
||||
const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4,
|
||||
@ -691,7 +691,7 @@ bool cPlugin_NewLua::OnUpdatedSign(
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnUpdatingSign(
|
||||
bool cPluginLua::OnUpdatingSign(
|
||||
cWorld * a_World,
|
||||
int a_BlockX, int a_BlockY, int a_BlockZ,
|
||||
AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4,
|
||||
@ -708,7 +708,7 @@ bool cPlugin_NewLua::OnUpdatingSign(
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnWeatherChanged(cWorld & a_World)
|
||||
bool cPluginLua::OnWeatherChanged(cWorld & a_World)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -720,7 +720,7 @@ bool cPlugin_NewLua::OnWeatherChanged(cWorld & a_World)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnWeatherChanging(cWorld & a_World, eWeather & a_NewWeather)
|
||||
bool cPluginLua::OnWeatherChanging(cWorld & a_World, eWeather & a_NewWeather)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
bool res = false;
|
||||
@ -734,7 +734,7 @@ bool cPlugin_NewLua::OnWeatherChanging(cWorld & a_World, eWeather & a_NewWeather
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::OnWorldTick(cWorld & a_World, float a_Dt)
|
||||
bool cPluginLua::OnWorldTick(cWorld & a_World, float a_Dt)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
m_LuaState.Call(GetHookFnName(cPluginManager::HOOK_WORLD_TICK), &a_World, a_Dt);
|
||||
@ -745,7 +745,7 @@ bool cPlugin_NewLua::OnWorldTick(cWorld & a_World, float a_Dt)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::HandleCommand(const AStringVector & a_Split, cPlayer * a_Player)
|
||||
bool cPluginLua::HandleCommand(const AStringVector & a_Split, cPlayer * a_Player)
|
||||
{
|
||||
ASSERT(!a_Split.empty());
|
||||
CommandMap::iterator cmd = m_Commands.find(a_Split[0]);
|
||||
@ -765,7 +765,7 @@ bool cPlugin_NewLua::HandleCommand(const AStringVector & a_Split, cPlayer * a_Pl
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::HandleConsoleCommand(const AStringVector & a_Split, cCommandOutputCallback & a_Output)
|
||||
bool cPluginLua::HandleConsoleCommand(const AStringVector & a_Split, cCommandOutputCallback & a_Output)
|
||||
{
|
||||
ASSERT(!a_Split.empty());
|
||||
CommandMap::iterator cmd = m_ConsoleCommands.find(a_Split[0]);
|
||||
@ -792,7 +792,7 @@ bool cPlugin_NewLua::HandleConsoleCommand(const AStringVector & a_Split, cComman
|
||||
|
||||
|
||||
|
||||
void cPlugin_NewLua::ClearCommands(void)
|
||||
void cPluginLua::ClearCommands(void)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
|
||||
@ -811,7 +811,7 @@ void cPlugin_NewLua::ClearCommands(void)
|
||||
|
||||
|
||||
|
||||
void cPlugin_NewLua::ClearConsoleCommands(void)
|
||||
void cPluginLua::ClearConsoleCommands(void)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
|
||||
@ -830,7 +830,7 @@ void cPlugin_NewLua::ClearConsoleCommands(void)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::CanAddHook(cPluginManager::PluginHook a_Hook)
|
||||
bool cPluginLua::CanAddHook(cPluginManager::PluginHook a_Hook)
|
||||
{
|
||||
const char * FnName = GetHookFnName(a_Hook);
|
||||
if (FnName == NULL)
|
||||
@ -871,7 +871,7 @@ bool cPlugin_NewLua::CanAddHook(cPluginManager::PluginHook a_Hook)
|
||||
|
||||
|
||||
|
||||
const char * cPlugin_NewLua::GetHookFnName(cPluginManager::PluginHook a_Hook)
|
||||
const char * cPluginLua::GetHookFnName(cPluginManager::PluginHook a_Hook)
|
||||
{
|
||||
switch (a_Hook)
|
||||
{
|
||||
@ -928,7 +928,7 @@ const char * cPlugin_NewLua::GetHookFnName(cPluginManager::PluginHook a_Hook)
|
||||
|
||||
|
||||
|
||||
AString cPlugin_NewLua::HandleWebRequest(const HTTPRequest * a_Request )
|
||||
AString cPluginLua::HandleWebRequest(const HTTPRequest * a_Request )
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
std::string RetVal = "";
|
||||
@ -968,7 +968,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 cPluginLua::AddWebTab(const AString & a_Title, lua_State * a_LuaState, int a_FunctionReference)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
if (a_LuaState != m_LuaState)
|
||||
@ -990,7 +990,7 @@ bool cPlugin_NewLua::AddWebTab(const AString & a_Title, lua_State * a_LuaState,
|
||||
|
||||
|
||||
|
||||
void cPlugin_NewLua::BindCommand(const AString & a_Command, int a_FnRef)
|
||||
void cPluginLua::BindCommand(const AString & a_Command, int a_FnRef)
|
||||
{
|
||||
ASSERT(m_Commands.find(a_Command) == m_Commands.end());
|
||||
m_Commands[a_Command] = a_FnRef;
|
||||
@ -1000,7 +1000,7 @@ void cPlugin_NewLua::BindCommand(const AString & a_Command, int a_FnRef)
|
||||
|
||||
|
||||
|
||||
void cPlugin_NewLua::BindConsoleCommand(const AString & a_Command, int a_FnRef)
|
||||
void cPluginLua::BindConsoleCommand(const AString & a_Command, int a_FnRef)
|
||||
{
|
||||
ASSERT(m_ConsoleCommands.find(a_Command) == m_ConsoleCommands.end());
|
||||
m_ConsoleCommands[a_Command] = a_FnRef;
|
||||
@ -1010,7 +1010,7 @@ void cPlugin_NewLua::BindConsoleCommand(const AString & a_Command, int a_FnRef)
|
||||
|
||||
|
||||
|
||||
void cPlugin_NewLua::Unreference(int a_LuaRef)
|
||||
void cPluginLua::Unreference(int a_LuaRef)
|
||||
{
|
||||
cCSLock Lock(m_CriticalSection);
|
||||
luaL_unref(m_LuaState, LUA_REGISTRYINDEX, a_LuaRef);
|
||||
@ -1020,7 +1020,7 @@ void cPlugin_NewLua::Unreference(int a_LuaRef)
|
||||
|
||||
|
||||
|
||||
bool cPlugin_NewLua::CallbackWindowClosing(int a_FnRef, cWindow & a_Window, cPlayer & a_Player, bool a_CanRefuse)
|
||||
bool cPluginLua::CallbackWindowClosing(int a_FnRef, cWindow & a_Window, cPlayer & a_Player, bool a_CanRefuse)
|
||||
{
|
||||
ASSERT(a_FnRef != LUA_REFNIL);
|
||||
|
||||
@ -1034,7 +1034,7 @@ bool cPlugin_NewLua::CallbackWindowClosing(int a_FnRef, cWindow & a_Window, cPla
|
||||
|
||||
|
||||
|
||||
void cPlugin_NewLua::CallbackWindowSlotChanged(int a_FnRef, cWindow & a_Window, int a_SlotNum)
|
||||
void cPluginLua::CallbackWindowSlotChanged(int a_FnRef, cWindow & a_Window, int a_SlotNum)
|
||||
{
|
||||
ASSERT(a_FnRef != LUA_REFNIL);
|
||||
|
||||
|
||||
@ -28,15 +28,15 @@ class cWindow;
|
||||
|
||||
|
||||
// tolua_begin
|
||||
class cPlugin_NewLua :
|
||||
class cPluginLua :
|
||||
public cPlugin,
|
||||
public cWebPlugin
|
||||
{
|
||||
public:
|
||||
// tolua_end
|
||||
|
||||
cPlugin_NewLua( const AString & a_PluginDirectory );
|
||||
~cPlugin_NewLua();
|
||||
cPluginLua( const AString & a_PluginDirectory );
|
||||
~cPluginLua();
|
||||
|
||||
virtual void OnDisable(void) override;
|
||||
virtual bool Initialize(void) override;
|
||||
|
||||
@ -1310,7 +1310,7 @@ bool cPluginManager::DisablePlugin(const AString & a_PluginName)
|
||||
|
||||
bool cPluginManager::LoadPlugin(const AString & a_PluginName)
|
||||
{
|
||||
return AddPlugin(new cPlugin_NewLua(a_PluginName.c_str()));
|
||||
return AddPlugin(new cPluginLua(a_PluginName.c_str()));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -109,7 +109,7 @@ public: // tolua_export
|
||||
HOOK_WORLD_TICK,
|
||||
|
||||
// Note that if a hook type is added, it may need processing in cPlugin::CanAddHook() descendants,
|
||||
// and it definitely needs adding in cPlugin_NewLua::GetHookFnName() !
|
||||
// and it definitely needs adding in cPluginLua::GetHookFnName() !
|
||||
} ;
|
||||
// tolua_end
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user