Code modernization: src/m* (part 2)

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

diff --git a/src/script/scripting_mainmenu.cpp b/src/script/scripting_mainmenu.cpp
index dbf1fc45e68443cd0dc747b0b5caf06cbd9bda88..b8a44205a9fc962c9853087b43aa42b69396ef7d 100644 (file)
--- a/src/script/scripting_mainmenu.cpp
+++ b/src/script/scripting_mainmenu.cpp
@@ -18,13 +18,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "scripting_mainmenu.h"
-#include "log.h"
-#include "filesys.h"
+#include "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"
@@ -36,21 +37,13 @@ extern "C" {
 MainMenuScripting::MainMenuScripting(GUIEngine* guiengine)
 {
        setGuiEngine(guiengine);
-
-       //TODO add security
-
-       luaL_openlibs(getStack());
+       setType(ScriptingType::MainMenu);
 
        SCRIPTAPI_PRECHECKHEADER
 
-       lua_newtable(L);
-       lua_setglobal(L, "engine");
-       lua_getglobal(L, "engine");
+       lua_getglobal(L, "core");
        int top = lua_gettop(L);
 
-       lua_pushstring(L, DIR_DELIM);
-       lua_setglobal(L, "DIR_DELIM");
-
        lua_newtable(L);
        lua_setglobal(L, "gamedata");
 
@@ -58,22 +51,26 @@ MainMenuScripting::MainMenuScripting(GUIEngine* guiengine)
        initializeModApi(L, top);
        lua_pop(L, 1);
 
+       // 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)
 {
+       registerLuaClasses(L, top);
+
        // Initialize mod API modules
        ModApiMainMenu::Initialize(L, top);
        ModApiUtil::Initialize(L, top);
+       ModApiSound::Initialize(L, top);
 
-       // Register reference classes (userdata)
-       LuaSettings::Register(L);
-
-       // Register functions to async environment
-       ModApiMainMenu::InitializeAsync(asyncEngine);
-       ModApiUtil::InitializeAsync(asyncEngine);
+       asyncEngine.registerStateInitializer(registerLuaClasses);
+       asyncEngine.registerStateInitializer(ModApiMainMenu::InitializeAsync);
+       asyncEngine.registerStateInitializer(ModApiUtil::InitializeAsync);
 
        // Initialize async environment
        //TODO possibly make number of async threads configurable
@@ -81,13 +78,21 @@ void MainMenuScripting::initializeModApi(lua_State *L, int top)
 }
 
 /******************************************************************************/
-void MainMenuScripting::step() {
-       asyncEngine.step(getStack(), m_errorhandler);
+void MainMenuScripting::registerLuaClasses(lua_State *L, int top)
+{
+       LuaSettings::Register(L);
+}
+
+/******************************************************************************/
+void MainMenuScripting::step()
+{
+       asyncEngine.step(getStack());
 }
 
 /******************************************************************************/
-unsigned int MainMenuScripting::queueAsync(std::string serialized_func,
-               std::string serialized_param) {
+unsigned int MainMenuScripting::queueAsync(const std::string &serialized_func,
+               const std::string &serialized_param)
+{
        return asyncEngine.queueAsyncJob(serialized_func, serialized_param);
 }