davidak
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MSVC compiling error (argc/argv not available to pass to init_gettext) 

Signed-off-by: Craig Robbins <kde.psych@gmail.com>
master
SmallJoker 2014-11-28 19:26:48 +01:00 committed by Craig Robbins
parent c30346ea30
commit a3e019c4f6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.cpp
View File

@ -157,7 +157,7 @@ static void list_game_ids();
static void list_worlds(); static void list_worlds();
static void setup_log_params(const Settings &cmd_args); static void setup_log_params(const Settings &cmd_args);
static bool create_userdata_path(); static bool create_userdata_path();
static bool init_common(int *log_level, const Settings &cmd_args); static bool init_common(int *log_level, const Settings &cmd_args, int argc, char *argv[]);
static void startup_message(); static void startup_message();
static bool read_config_file(const Settings &cmd_args); static bool read_config_file(const Settings &cmd_args);
static void init_debug_streams(int *log_level, const Settings &cmd_args); static void init_debug_streams(int *log_level, const Settings &cmd_args);
@ -831,7 +831,7 @@ int main(int argc, char *argv[])
} }
GameParams game_params; GameParams game_params;
if (!init_common(&game_params.log_level, cmd_args)) if (!init_common(&game_params.log_level, cmd_args, argc, argv))
return 1; return 1;
#ifndef __ANDROID__ #ifndef __ANDROID__
@ -1086,7 +1086,7 @@ static bool create_userdata_path()
return success; return success;
} }
static bool init_common(int *log_level, const Settings &cmd_args) static bool init_common(int *log_level, const Settings &cmd_args, int argc, char *argv[])
{ {
startup_message(); startup_message();
set_default_settings(g_settings); set_default_settings(g_settings);