Fix some reference counters (memleak) (#8981)

[minetest.git] / src / script / scripting_mainmenu.cpp

diff --git a/src/script/scripting_mainmenu.cpp b/src/script/scripting_mainmenu.cpp
index 31581a1bfdab3b0593a40ccec6b891a4ffbb9fcf..b6068439a15449af596626a35f9e70b82665319c 100644 (file)
--- a/src/script/scripting_mainmenu.cpp
+++ b/src/script/scripting_mainmenu.cpp
@@ -18,52 +18,81 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "scripting_mainmenu.h"
-#include "log.h"
-#include "filesys.h"
+#include "content/mods.h"
 #include "cpp_api/s_internal.h"
 #include "lua_api/l_base.h"
 #include "lua_api/l_mainmenu.h"
+#include "lua_api/l_sound.h"
 #include "lua_api/l_util.h"
 #include "lua_api/l_settings.h"
+#include "log.h"
 
 extern "C" {
 #include "lualib.h"
 }
 
-MainMenuScripting::MainMenuScripting(GUIEngine* guiengine)
-{
-       setGuiEngine(guiengine);
+#define MAINMENU_NUM_ASYNC_THREADS 4
 
-       //TODO add security
 
-       luaL_openlibs(getStack());
+MainMenuScripting::MainMenuScripting(GUIEngine* guiengine):
+               ScriptApiBase(ScriptingType::MainMenu)
+{
+       setGuiEngine(guiengine);
 
        SCRIPTAPI_PRECHECKHEADER
 
-       lua_pushstring(L, DIR_DELIM);
-       lua_setglobal(L, "DIR_DELIM");
+       lua_getglobal(L, "core");
+       int top = lua_gettop(L);
 
        lua_newtable(L);
        lua_setglobal(L, "gamedata");
 
-       lua_newtable(L);
-       lua_setglobal(L, "engine");
-
        // Initialize our lua_api modules
-       lua_getglobal(L, "engine");
-       int top = lua_gettop(L);
-       InitializeModApi(L, top);
+       initializeModApi(L, top);
        lua_pop(L, 1);
 
-       infostream << "SCRIPTAPI: initialized mainmenu modules" << std::endl;
+       // Push builtin initialization type
+       lua_pushstring(L, "mainmenu");
+       lua_setglobal(L, "INIT");
+
+       infostream << "SCRIPTAPI: Initialized main menu modules" << std::endl;
 }
 
-void MainMenuScripting::InitializeModApi(lua_State *L, int top)
+/******************************************************************************/
+void MainMenuScripting::initializeModApi(lua_State *L, int top)
 {
-       // Initialize mod api modules
+       registerLuaClasses(L, top);
+
+       // Initialize mod API modules
        ModApiMainMenu::Initialize(L, top);
        ModApiUtil::Initialize(L, top);
+       ModApiSound::Initialize(L, top);
 
-       // Register reference classes (userdata)
+       asyncEngine.registerStateInitializer(registerLuaClasses);
+       asyncEngine.registerStateInitializer(ModApiMainMenu::InitializeAsync);
+       asyncEngine.registerStateInitializer(ModApiUtil::InitializeAsync);
+
+       // Initialize async environment
+       //TODO possibly make number of async threads configurable
+       asyncEngine.initialize(MAINMENU_NUM_ASYNC_THREADS);
+}
+
+/******************************************************************************/
+void MainMenuScripting::registerLuaClasses(lua_State *L, int top)
+{
        LuaSettings::Register(L);
 }
+
+/******************************************************************************/
+void MainMenuScripting::step()
+{
+       asyncEngine.step(getStack());
+}
+
+/******************************************************************************/
+unsigned int MainMenuScripting::queueAsync(const std::string &serialized_func,
+               const std::string &serialized_param)
+{
+       return asyncEngine.queueAsyncJob(serialized_func, serialized_param);
+}
+