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:44:42 +0100
committerGitHub <noreply@github.com>2020-11-04 16:44:42 +0100
commit5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch)
treec980d614fec4a5495798be3e79e033229062c3cd /src/script/scripting_mainmenu.cpp
parent28f6a79706b088c37268a59d90878220dc4ef9c7 (diff)
parent3af10766fd2b58b068e970266724d7eb10e9316b (diff)
downloaddragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.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, 4 insertions, 6 deletions
diff --git a/src/script/scripting_mainmenu.cpp b/src/script/scripting_mainmenu.cpp
index 0f672f917..835368776 100644
--- a/src/script/scripting_mainmenu.cpp
+++ b/src/script/scripting_mainmenu.cpp
@@ -34,8 +34,7 @@ extern "C" {
#define MAINMENU_NUM_ASYNC_THREADS 4
-
-MainMenuScripting::MainMenuScripting(GUIEngine* guiengine):
+MainMenuScripting::MainMenuScripting(GUIEngine *guiengine) :
ScriptApiBase(ScriptingType::MainMenu)
{
setGuiEngine(guiengine);
@@ -76,7 +75,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);
}
@@ -93,9 +92,8 @@ 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);
}
-