Line_of_sight: Improve using VoxelLineIterator

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

diff --git a/src/script/scripting_mainmenu.cpp b/src/script/scripting_mainmenu.cpp
index 54b3133c5064be1bda6fa8f23e9346cb7e0f7873..b8a44205a9fc962c9853087b43aa42b69396ef7d 100644 (file)
--- a/src/script/scripting_mainmenu.cpp
+++ b/src/script/scripting_mainmenu.cpp
@@ -19,13 +19,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "scripting_mainmenu.h"
 #include "mods.h"
-#include "porting.h"
-#include "log.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"
@@ -37,8 +37,7 @@ extern "C" {
 MainMenuScripting::MainMenuScripting(GUIEngine* guiengine)
 {
        setGuiEngine(guiengine);
-
-       //TODO add security
+       setType(ScriptingType::MainMenu);
 
        SCRIPTAPI_PRECHECKHEADER
 
@@ -62,16 +61,16 @@ MainMenuScripting::MainMenuScripting(GUIEngine* guiengine)
 /******************************************************************************/
 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
@@ -79,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);
 }