Remove dependency on marshal and many other async changes

This makes a number of changes:
  * Remove the dependency on marshal by using string.dump and loadstring.
  * Use lua_tolstring rather than having Lua functions pass string lengths to C++.
  * Move lua_api/l_async_events.* to cpp_api/s_async.*, where it belongs.
  * Make AsyncWorkerThread a child of ScriptApiBase, this removes some duplicate functionality.
  * Don't wait for async threads to shut down.  (Is this safe?  Might result in corruption if the thread is writing to a file.)
  * Pop more unused items from the stack
  * Code style fixes
  * Other misc changes

1 files changed, 4 insertions, 7 deletions

diff --git a/src/script/scripting_mainmenu.h b/src/script/scripting_mainmenu.h
index f4d78f664..6a95d3fc9 100644
--- a/src/script/scripting_mainmenu.h
+++ b/src/script/scripting_mainmenu.h
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "cpp_api/s_base.h"
 #include "cpp_api/s_mainmenu.h"
-#include "lua_api/l_async_events.h"
+#include "cpp_api/s_async.h"
 
 /*****************************************************************************/
 /* Scripting <-> Main Menu Interface                                         */
@@ -35,14 +35,11 @@ class MainMenuScripting
 public:
 	MainMenuScripting(GUIEngine* guiengine);
 
-	// use ScriptApiBase::loadMod() or ScriptApiBase::loadScript()
-	// to load scripts
-
-	/* global step handler to pass back async events */
+	// Global step handler to pass back async events
 	void Step();
 
-	/* pass async events from engine to async threads */
-	unsigned int DoAsync(std::string serialized_fct,
+	// Pass async events from engine to async threads
+	unsigned int DoAsync(std::string serialized_func,
 			std::string serialized_params);
 private:
 	void InitializeModApi(lua_State *L, int top);