aboutsummaryrefslogtreecommitdiff
path: root/src/script/scripting_mainmenu.cpp
diff options
context:
space:
mode:
authorElias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com>2020-11-04 16:57:47 +0100
committerGitHub <noreply@github.com>2020-11-04 16:57:47 +0100
commit3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch)
treec070350db219f2c4241d22bc31949685c7b42fe9 /src/script/scripting_mainmenu.cpp
parent5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff)
parent6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff)
downloaddragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz
Merge branch 'master' into master
Diffstat (limited to 'src/script/scripting_mainmenu.cpp')
-rw-r--r--src/script/scripting_mainmenu.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/script/scripting_mainmenu.cpp b/src/script/scripting_mainmenu.cpp
index 835368776..0f672f917 100644
--- a/src/script/scripting_mainmenu.cpp
+++ b/src/script/scripting_mainmenu.cpp
@@ -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);
@@ -75,7 +76,7 @@ void MainMenuScripting::initializeModApi(lua_State *L, int top)
asyncEngine.registerStateInitializer(ModApiHttp::InitializeAsync);
// Initialize async environment
- // TODO possibly make number of async threads configurable
+ //TODO possibly make number of async threads configurable
asyncEngine.initialize(MAINMENU_NUM_ASYNC_THREADS);
}
@@ -92,8 +93,9 @@ void MainMenuScripting::step()
}
/******************************************************************************/
-unsigned int MainMenuScripting::queueAsync(
- const std::string &serialized_func, const 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);
}
+