1 files changed, 117 insertions, 95 deletions

diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index 6e579b364..aebdbc34b 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -513,7 +513,7 @@ static int tolua_DoWith(lua_State* tolua_S)
 	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a non-empty string for parameter #1", NumArgs);
 	}
-	if (!lua_isfunction( tolua_S, 3))
+	if (!lua_isfunction(tolua_S, 3))
 	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a function for parameter #2", NumArgs);
 	}
@@ -539,20 +539,21 @@ static int tolua_DoWith(lua_State* tolua_S)
 	class cLuaCallback : public cItemCallback<Ty2>
 	{
 	public:
-		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef)
-			: LuaState( a_LuaState)
-			, FuncRef( a_FuncRef)
-			, TableRef( a_TableRef)
-		{}
+		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef):
+			LuaState(a_LuaState),
+			FuncRef(a_FuncRef),
+			TableRef(a_TableRef)
+		{
+		}
 
 	private:
 		virtual bool Item(Ty2 * a_Item) override
 		{
-			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
+			lua_rawgeti(LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
 			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());
 			if (TableRef != LUA_REFNIL)
 			{
-				lua_rawgeti( LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */
+				lua_rawgeti(LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */
 			}
 
 			int s = lua_pcall(LuaState, (TableRef == LUA_REFNIL ? 1 : 2), 1, 0);
@@ -633,7 +634,8 @@ static int tolua_DoWithID(lua_State* tolua_S)
 			LuaState(a_LuaState),
 			FuncRef(a_FuncRef),
 			TableRef(a_TableRef)
-		{}
+		{
+		}
 
 	private:
 		virtual bool Item(Ty2 * a_Item) override
@@ -699,7 +701,7 @@ static int tolua_DoWithXYZ(lua_State* tolua_S)
 	int ItemX = ((int)tolua_tonumber(tolua_S, 2, 0));
 	int ItemY = ((int)tolua_tonumber(tolua_S, 3, 0));
 	int ItemZ = ((int)tolua_tonumber(tolua_S, 4, 0));
-	if (!lua_isfunction( tolua_S, 5))
+	if (!lua_isfunction(tolua_S, 5))
 	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a function for parameter #4");
 	}
@@ -725,20 +727,21 @@ static int tolua_DoWithXYZ(lua_State* tolua_S)
 	class cLuaCallback : public cItemCallback<Ty2>
 	{
 	public:
-		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef)
-			: LuaState( a_LuaState)
-			, FuncRef( a_FuncRef)
-			, TableRef( a_TableRef)
-		{}
+		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef):
+			LuaState(a_LuaState),
+			FuncRef(a_FuncRef),
+			TableRef(a_TableRef)
+		{
+		}
 
 	private:
 		virtual bool Item(Ty2 * a_Item) override
 		{
-			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
+			lua_rawgeti(LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
 			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());
 			if (TableRef != LUA_REFNIL)
 			{
-				lua_rawgeti( LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */
+				lua_rawgeti(LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */
 			}
 
 			int s = lua_pcall(LuaState, (TableRef == LUA_REFNIL ? 1 : 2), 1, 0);
@@ -794,7 +797,7 @@ static int tolua_ForEachInChunk(lua_State * tolua_S)
 	int ChunkX = ((int)tolua_tonumber(tolua_S, 2, 0));
 	int ChunkZ = ((int)tolua_tonumber(tolua_S, 3, 0));
 
-	if (!lua_isfunction( tolua_S, 4))
+	if (!lua_isfunction(tolua_S, 4))
 	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a function for parameter #3");
 	}
@@ -820,20 +823,21 @@ static int tolua_ForEachInChunk(lua_State * tolua_S)
 	class cLuaCallback : public cItemCallback<Ty2>
 	{
 	public:
-		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef)
-			: LuaState( a_LuaState)
-			, FuncRef( a_FuncRef)
-			, TableRef( a_TableRef)
-		{}
+		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef):
+			LuaState(a_LuaState),
+			FuncRef(a_FuncRef),
+			TableRef(a_TableRef)
+		{
+		}
 
 	private:
 		virtual bool Item(Ty2 * a_Item) override
 		{
-			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
+			lua_rawgeti(LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
 			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());
 			if (TableRef != LUA_REFNIL)
 			{
-				lua_rawgeti( LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */
+				lua_rawgeti(LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */
 			}
 
 			int s = lua_pcall(LuaState, (TableRef == LUA_REFNIL ? 1 : 2), 1, 0);
@@ -908,7 +912,8 @@ static int tolua_ForEachInBox(lua_State * tolua_S)
 		cLuaCallback(cLuaState & a_LuaState, cLuaState::cRef & a_FuncRef) :
 			m_LuaState(a_LuaState),
 			m_FnRef(a_FuncRef)
-		{}
+		{
+		}
 
 	private:
 		// cItemCallback<Ty2> overrides:
@@ -960,7 +965,7 @@ static int tolua_ForEach(lua_State * tolua_S)
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Not called on an object instance");
 	}
 
-	if (!lua_isfunction( tolua_S, 2))
+	if (!lua_isfunction(tolua_S, 2))
 	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a function for parameter #1");
 	}
@@ -986,20 +991,21 @@ static int tolua_ForEach(lua_State * tolua_S)
 	class cLuaCallback : public cItemCallback<Ty2>
 	{
 	public:
-		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef)
-			: LuaState( a_LuaState)
-			, FuncRef( a_FuncRef)
-			, TableRef( a_TableRef)
-		{}
+		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef):
+			LuaState(a_LuaState),
+			FuncRef(a_FuncRef),
+			TableRef(a_TableRef)
+		{
+		}
 
 	private:
 		virtual bool Item(Ty2 * a_Item) override
 		{
-			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
-			tolua_pushusertype( LuaState, a_Item, Ty2::GetClassStatic());
+			lua_rawgeti(LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
+			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());
 			if (TableRef != LUA_REFNIL)
 			{
-				lua_rawgeti( LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */
+				lua_rawgeti(LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */
 			}
 
 			int s = lua_pcall(LuaState, (TableRef == LUA_REFNIL ? 1 : 2), 1, 0);
@@ -1010,7 +1016,7 @@ static int tolua_ForEach(lua_State * tolua_S)
 
 			if (lua_isboolean(LuaState, -1))
 			{
-				return (tolua_toboolean( LuaState, -1, 0) > 0);
+				return (tolua_toboolean(LuaState, -1, 0) > 0);
 			}
 			return false;  /* Continue enumeration */
 		}
@@ -1447,29 +1453,12 @@ static int tolua_cWorld_ScheduleTask(lua_State * tolua_S)
 
 static int tolua_cPluginManager_GetAllPlugins(lua_State * tolua_S)
 {
-	cPluginManager * self = (cPluginManager *)tolua_tousertype(tolua_S, 1, nullptr);
-
-	const cPluginManager::PluginMap & AllPlugins = self->GetAllPlugins();
+	// API function no longer available:
+	LOGWARNING("cPluginManager:GetAllPlugins() is no longer available, use cPluginManager:ForEachPlugin() instead");
+	cLuaState::LogStackTrace(tolua_S);
 
+	// Return an empty table:
 	lua_newtable(tolua_S);
-	int index = 1;
-	cPluginManager::PluginMap::const_iterator iter = AllPlugins.begin();
-	while (iter != AllPlugins.end())
-	{
-		const cPlugin* Plugin = iter->second;
-		tolua_pushstring(tolua_S, iter->first.c_str());
-		if (Plugin != nullptr)
-		{
-			tolua_pushusertype(tolua_S, (void *)Plugin, "const cPlugin");
-		}
-		else
-		{
-			tolua_pushboolean(tolua_S, 0);
-		}
-		lua_rawset(tolua_S, -3);
-		++iter;
-		++index;
-	}
 	return 1;
 }
 
@@ -1493,6 +1482,18 @@ static int tolua_cPluginManager_GetCurrentPlugin(lua_State * S)
 
 
 
+static int tolua_cPluginManager_GetPlugin(lua_State * tolua_S)
+{
+	// API function no longer available:
+	LOGWARNING("cPluginManager:GetPlugin() is no longer available. Use cPluginManager:DoWithPlugin() or cPluginManager:CallPlugin() instead.");
+	cLuaState::LogStackTrace(tolua_S);
+	return 0;
+}
+
+
+
+
+
 static int tolua_cPluginManager_LogStackTrace(lua_State * S)
 {
 	cLuaState::LogStackTrace(S);
@@ -1694,10 +1695,11 @@ static int tolua_cPluginManager_ForEachCommand(lua_State * tolua_S)
 	class cLuaCallback : public cPluginManager::cCommandEnumCallback
 	{
 	public:
-		cLuaCallback(lua_State * a_LuaState, int a_FuncRef)
-			: LuaState( a_LuaState)
-			, FuncRef( a_FuncRef)
-		{}
+		cLuaCallback(lua_State * a_LuaState, int a_FuncRef):
+			LuaState(a_LuaState),
+			FuncRef(a_FuncRef)
+		{
+		}
 
 	private:
 		virtual bool Command(const AString & a_Command, const cPlugin * a_Plugin, const AString & a_Permission, const AString & a_HelpString) override
@@ -1717,7 +1719,7 @@ static int tolua_cPluginManager_ForEachCommand(lua_State * tolua_S)
 
 			if (lua_isboolean(LuaState, -1))
 			{
-				return (tolua_toboolean( LuaState, -1, 0) > 0);
+				return (tolua_toboolean(LuaState, -1, 0) > 0);
 			}
 			return false;  /* Continue enumeration */
 		}
@@ -1771,10 +1773,11 @@ static int tolua_cPluginManager_ForEachConsoleCommand(lua_State * tolua_S)
 	class cLuaCallback : public cPluginManager::cCommandEnumCallback
 	{
 	public:
-		cLuaCallback(lua_State * a_LuaState, int a_FuncRef)
-			: LuaState( a_LuaState)
-			, FuncRef( a_FuncRef)
-		{}
+		cLuaCallback(lua_State * a_LuaState, int a_FuncRef):
+			LuaState(a_LuaState),
+			FuncRef(a_FuncRef)
+		{
+		}
 
 	private:
 		virtual bool Command(const AString & a_Command, const cPlugin * a_Plugin, const AString & a_Permission, const AString & a_HelpString) override
@@ -1794,7 +1797,7 @@ static int tolua_cPluginManager_ForEachConsoleCommand(lua_State * tolua_S)
 
 			if (lua_isboolean(LuaState, -1))
 			{
-				return (tolua_toboolean( LuaState, -1, 0) > 0);
+				return (tolua_toboolean(LuaState, -1, 0) > 0);
 			}
 			return false;  /* Continue enumeration */
 		}
@@ -2011,7 +2014,11 @@ static int tolua_cPluginManager_CallPlugin(lua_State * tolua_S)
 		
 		virtual bool Item(cPlugin * a_Plugin) override
 		{
-			m_NumReturns = ((cPluginLua *)a_Plugin)->CallFunctionFromForeignState(
+			if (!a_Plugin->IsLoaded())
+			{
+				return false;
+			}
+			m_NumReturns = static_cast<cPluginLua *>(a_Plugin)->CallFunctionFromForeignState(
 				m_FunctionName, m_SrcLuaState, 4, lua_gettop(m_SrcLuaState)
 			);
 			return true;
@@ -2019,9 +2026,6 @@ static int tolua_cPluginManager_CallPlugin(lua_State * tolua_S)
 	} Callback(FunctionName, L);
 	if (!cPluginManager::Get()->DoWithPlugin(PluginName, Callback))
 	{
-		// TODO 2014_01_20 _X: This might be too much logging, plugins cannot know if other plugins are loaded (async)
-		LOGWARNING("cPluginManager::CallPlugin: No such plugin name (\"%s\")", PluginName.c_str());
-		L.LogStackTrace();
 		return 0;
 	}
 	return Callback.m_NumReturns;
@@ -2031,6 +2035,21 @@ static int tolua_cPluginManager_CallPlugin(lua_State * tolua_S)
 
 
 
+static int tolua_cPluginManager_FindPlugins(lua_State * tolua_S)
+{
+	// API function no longer exists:
+	LOGWARNING("cPluginManager:FindPlugins() is obsolete, use cPluginManager:RefreshPluginList() instead!");
+	cLuaState::LogStackTrace(tolua_S);
+
+	// Still, do the actual work performed by the API function when it existed:
+	cPluginManager::Get()->RefreshPluginList();
+	return 0;
+}
+
+
+
+
+
 static int tolua_cWorld_ChunkStay(lua_State * tolua_S)
 {
 	/* Function signature:
@@ -2337,40 +2356,40 @@ static int tolua_cPluginLua_AddWebTab(lua_State * tolua_S)
 
 
 
-static int tolua_cPluginLua_AddTab(lua_State* tolua_S)
+static int tolua_cPlugin_GetDirectory(lua_State * tolua_S)
 {
-	cPluginLua * self = (cPluginLua *) tolua_tousertype(tolua_S, 1, nullptr);
-	LOGWARN("WARNING: Using deprecated function AddTab()! Use AddWebTab() instead. (plugin \"%s\" in folder \"%s\")",
-		self->GetName().c_str(), self->GetDirectory().c_str()
-	);
-	return tolua_cPluginLua_AddWebTab( tolua_S);
+	cLuaState L(tolua_S);
+	
+	// Log the obsoletion warning:
+	LOGWARNING("cPlugin:GetDirectory() is obsolete, use cPlugin:GetFolderName() instead.");
+	L.LogStackTrace();
+	
+	// Retrieve the params:
+	cPlugin * Plugin = static_cast<cPluginLua *>(tolua_tousertype(tolua_S, 1, nullptr));
+	
+	// Get the folder name:
+	L.Push(Plugin->GetFolderName());
+	return 1;
 }
 
 
 
 
 
-static int tolua_cPlugin_Call(lua_State * tolua_S)
+static int tolua_cPlugin_GetLocalDirectory(lua_State * tolua_S)
 {
 	cLuaState L(tolua_S);
 	
 	// Log the obsoletion warning:
-	LOGWARNING("cPlugin:Call() is obsolete and unsafe, use cPluginManager:CallPlugin() instead.");
+	LOGWARNING("cPlugin:GetLocalDirectory() is obsolete, use cPlugin:GetLocalFolder() instead.");
 	L.LogStackTrace();
 	
-	// Retrieve the params: plugin and the function name to call
-	cPluginLua * TargetPlugin = (cPluginLua *) tolua_tousertype(tolua_S, 1, nullptr);
-	AString FunctionName = tolua_tostring(tolua_S, 2, "");
+	// Retrieve the params:
+	cPlugin * Plugin = static_cast<cPluginLua *>(tolua_tousertype(tolua_S, 1, nullptr));
 	
-	// Call the function:
-	int NumReturns = TargetPlugin->CallFunctionFromForeignState(FunctionName, L, 3, lua_gettop(L));
-	if (NumReturns < 0)
-	{
-		LOGWARNING("cPlugin::Call() failed to call destination function");
-		L.LogStackTrace();
-		return 0;
-	}
-	return NumReturns;
+	// Get the folder:
+	L.Push(Plugin->GetLocalFolder());
+	return 1;
 }
 
 
@@ -2639,8 +2658,8 @@ static int tolua_cWebPlugin_GetTabNames(lua_State * tolua_S)
 	{
 		const AString & FancyName = iter->first;
 		const AString & WebName = iter->second;
-		tolua_pushstring( tolua_S, WebName.c_str());  // Because the WebName is supposed to be unique, use it as key
-		tolua_pushstring( tolua_S, FancyName.c_str());
+		tolua_pushstring(tolua_S, WebName.c_str());  // Because the WebName is supposed to be unique, use it as key
+		tolua_pushstring(tolua_S, FancyName.c_str());
 		//
 		lua_rawset(tolua_S, -3);
 		++iter;
@@ -3792,7 +3811,8 @@ void ManualBindings::Bind(lua_State * tolua_S)
 		tolua_endmodule(tolua_S);
 		
 		tolua_beginmodule(tolua_S, "cPlugin");
-			tolua_function(tolua_S, "Call", tolua_cPlugin_Call);
+			tolua_function(tolua_S, "GetDirectory",      tolua_cPlugin_GetDirectory);
+			tolua_function(tolua_S, "GetLocalDirectory", tolua_cPlugin_GetLocalDirectory);
 		tolua_endmodule(tolua_S);
 		
 		tolua_beginmodule(tolua_S, "cPluginManager");
@@ -3800,10 +3820,13 @@ void ManualBindings::Bind(lua_State * tolua_S)
 			tolua_function(tolua_S, "BindCommand",           tolua_cPluginManager_BindCommand);
 			tolua_function(tolua_S, "BindConsoleCommand",    tolua_cPluginManager_BindConsoleCommand);
 			tolua_function(tolua_S, "CallPlugin",            tolua_cPluginManager_CallPlugin);
+			tolua_function(tolua_S, "FindPlugins",           tolua_cPluginManager_FindPlugins);
 			tolua_function(tolua_S, "ForEachCommand",        tolua_cPluginManager_ForEachCommand);
 			tolua_function(tolua_S, "ForEachConsoleCommand", tolua_cPluginManager_ForEachConsoleCommand);
+			tolua_function(tolua_S, "ForEachPlugin",         tolua_ForEach<cPluginManager, cPlugin, &cPluginManager::ForEachPlugin>);
 			tolua_function(tolua_S, "GetAllPlugins",         tolua_cPluginManager_GetAllPlugins);
 			tolua_function(tolua_S, "GetCurrentPlugin",      tolua_cPluginManager_GetCurrentPlugin);
+			tolua_function(tolua_S, "GetPlugin",             tolua_cPluginManager_GetPlugin);
 			tolua_function(tolua_S, "LogStackTrace",         tolua_cPluginManager_LogStackTrace);
 		tolua_endmodule(tolua_S);
 		
@@ -3819,7 +3842,6 @@ void ManualBindings::Bind(lua_State * tolua_S)
 		tolua_endmodule(tolua_S);
 
 		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);