summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/client/clientlauncher.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index 357d98b4d..404a16310 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -201,6 +201,9 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
bool game_has_run = launch_game(error_message, reconnect_requested,
game_params, cmd_args);
+ // Reset the reconnect_requested flag
+ reconnect_requested = false;
+
// If skip_main_menu, we only want to startup once
if (skip_main_menu && !first_loop)
break;
@@ -336,6 +339,7 @@ bool ClientLauncher::launch_game(std::string &error_message,
MainMenuData menudata;
menudata.address = address;
menudata.name = playername;
+ menudata.password = password;
menudata.port = itos(game_params.socket_port);
menudata.script_data.errormessage = error_message;
menudata.script_data.reconnect_requested = reconnect_requested;
pan> #include "filesys.h" #include "cpp_api/s_internal.h" #include "lua_api/l_base.h" #include "lua_api/l_mainmenu.h" #include "lua_api/l_util.h" extern "C" { #include "lualib.h" } MainMenuScripting::MainMenuScripting(GUIEngine* guiengine) { setGuiEngine(guiengine); //TODO add security luaL_openlibs(getStack()); SCRIPTAPI_PRECHECKHEADER lua_pushstring(L, DIR_DELIM); lua_setglobal(L, "DIR_DELIM"); lua_newtable(L); lua_setglobal(L, "gamedata"); lua_newtable(L); lua_setglobal(L, "engine"); // Initialize our lua_api modules lua_getglobal(L, "engine"); int top = lua_gettop(L); InitializeModApi(L, top); lua_pop(L, 1); infostream << "SCRIPTAPI: initialized mainmenu modules" << std::endl; } void MainMenuScripting::InitializeModApi(lua_State *L, int top) { // Initialize mod api modules ModApiMainMenu::Initialize(L, top); ModApiUtil::Initialize(L, top); }