flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added cPluginManager:GetCurrentPlugin() to Lua API.

Browse Source
This commit is contained in:
madmaxoft 2013-12-05 22:03:07 +01:00
parent 1373539bce
commit 1205c540ee
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/ManualBindings.cpp
View File

@ -985,28 +985,26 @@ static int tolua_cWorld_QueueTask(lua_State * tolua_S)
static int tolua_cPluginManager_GetAllPlugins(lua_State * tolua_S) static int tolua_cPluginManager_GetAllPlugins(lua_State * tolua_S)
{ {
cPluginManager* self = (cPluginManager*) tolua_tousertype(tolua_S,1,0); cPluginManager * self = (cPluginManager *)tolua_tousertype(tolua_S, 1, 0);
const cPluginManager::PluginMap & AllPlugins = self->GetAllPlugins(); const cPluginManager::PluginMap & AllPlugins = self->GetAllPlugins();
lua_newtable(tolua_S); lua_newtable(tolua_S);
//lua_createtable(tolua_S, AllPlugins.size(), 0);
int newTable = lua_gettop(tolua_S); int newTable = lua_gettop(tolua_S);
int index = 1; int index = 1;
cPluginManager::PluginMap::const_iterator iter = AllPlugins.begin(); cPluginManager::PluginMap::const_iterator iter = AllPlugins.begin();
while(iter != AllPlugins.end()) while (iter != AllPlugins.end())
{ {
const cPlugin* Plugin = iter->second; const cPlugin* Plugin = iter->second;
tolua_pushstring( tolua_S, iter->first.c_str() ); tolua_pushstring(tolua_S, iter->first.c_str());
if( Plugin != NULL ) if (Plugin != NULL)
{ {
tolua_pushusertype( tolua_S, (void*)Plugin, "const cPlugin" ); tolua_pushusertype(tolua_S, (void *)Plugin, "const cPlugin");
} }
else else
{ {
tolua_pushboolean(tolua_S, 0); tolua_pushboolean(tolua_S, 0);
} }
//lua_rawseti(tolua_S, newTable, index);
lua_rawset(tolua_S, -3); lua_rawset(tolua_S, -3);
++iter; ++iter;
++index; ++index;
@ -1018,6 +1016,22 @@ static int tolua_cPluginManager_GetAllPlugins(lua_State * tolua_S)
static int tolua_cPluginManager_GetCurrentPlugin(lua_State * S)
{
cPluginLua * Plugin = GetLuaPlugin(S);
if (Plugin == NULL)
{
// An error message has already been printed in GetLuaPlugin()
return 0;
}
tolua_pushusertype(S, Plugin, "cPluginLua");
return 1;
}
static int tolua_cPluginManager_AddHook_FnRef(cPluginManager * a_PluginManager, cLuaState & S, int a_ParamIdx) static int tolua_cPluginManager_AddHook_FnRef(cPluginManager * a_PluginManager, cLuaState & S, int a_ParamIdx)
{ {
// Helper function for cPluginmanager:AddHook() binding // Helper function for cPluginmanager:AddHook() binding
@ -2231,6 +2245,7 @@ void ManualBindings::Bind(lua_State * tolua_S)
tolua_function(tolua_S, "ForEachCommand", tolua_cPluginManager_ForEachCommand); tolua_function(tolua_S, "ForEachCommand", tolua_cPluginManager_ForEachCommand);
tolua_function(tolua_S, "ForEachConsoleCommand", tolua_cPluginManager_ForEachConsoleCommand); tolua_function(tolua_S, "ForEachConsoleCommand", tolua_cPluginManager_ForEachConsoleCommand);
tolua_function(tolua_S, "GetAllPlugins", tolua_cPluginManager_GetAllPlugins); tolua_function(tolua_S, "GetAllPlugins", tolua_cPluginManager_GetAllPlugins);
tolua_function(tolua_S, "GetCurrentPlugin", tolua_cPluginManager_GetCurrentPlugin);
tolua_endmodule(tolua_S); tolua_endmodule(tolua_S);
tolua_beginmodule(tolua_S, "cPlayer"); tolua_beginmodule(tolua_S, "cPlayer");