Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix regression with command line --go option

This commit is contained in:
Craig Robbins 2014-11-28 22:29:34 +10:00
parent 6a43b3af09
commit edb125837c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main.cpp
View File

@ -1818,8 +1818,17 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
void ClientLauncher::init_args(GameParams &game_params, const Settings &cmd_args) void ClientLauncher::init_args(GameParams &game_params, const Settings &cmd_args)
{ {
skip_main_menu = cmd_args.getFlag("go");
// FIXME: This is confusing (but correct)
/* If world_path is set then override it unless skipping the main menu using
* the --go command line param. Else, give preference to the address
* supplied on the command line
*/
address = g_settings->get("address"); address = g_settings->get("address");
if (game_params.world_path != "") if (game_params.world_path != "" && !skip_main_menu)
address = ""; address = "";
else if (cmd_args.exists("address")) else if (cmd_args.exists("address"))
address = cmd_args.get("address"); address = cmd_args.get("address");
@ -1828,8 +1837,6 @@ void ClientLauncher::init_args(GameParams &game_params, const Settings &cmd_args
if (cmd_args.exists("name")) if (cmd_args.exists("name"))
playername = cmd_args.get("name"); playername = cmd_args.get("name");
skip_main_menu = cmd_args.getFlag("go");
list_video_modes = cmd_args.getFlag("videomodes"); list_video_modes = cmd_args.getFlag("videomodes");
use_freetype = g_settings->getBool("freetype"); use_freetype = g_settings->getBool("freetype");