Fix core.get_connected_players() returning unusable ObjectRefs

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

diff --git a/src/script/scripting_mainmenu.cpp b/src/script/scripting_mainmenu.cpp
index b1e50c94b446c2a5210a4db0ba0234b8167479ca..b6068439a15449af596626a35f9e70b82665319c 100644 (file)
--- a/src/script/scripting_mainmenu.cpp
+++ b/src/script/scripting_mainmenu.cpp
@@ -18,14 +18,14 @@ 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 "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"
@@ -34,7 +34,8 @@ extern "C" {
 #define MAINMENU_NUM_ASYNC_THREADS 4
 
 
-MainMenuScripting::MainMenuScripting(GUIEngine* guiengine)
+MainMenuScripting::MainMenuScripting(GUIEngine* guiengine):
+               ScriptApiBase(ScriptingType::MainMenu)
 {
        setGuiEngine(guiengine);
 
@@ -60,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
@@ -77,13 +78,21 @@ void MainMenuScripting::initializeModApi(lua_State *L, int top)
 }
 
 /******************************************************************************/
-void MainMenuScripting::step() {
+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);
 }