diff options
| author | SmallJoker <mk939@ymail.com> | 2014-11-28 19:26:48 +0100 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2014-11-29 22:31:40 +1000 |
| commit | a3e019c4f6745d06d7afed7991b9c682b0ea65b9 (patch) | |
| tree | 87a48965b26f5b74dca11c0709c8b09eb5cd604d | |
| parent | c30346ea3093ed96693e628493f5722c615ba138 (diff) | |
| download | minetest-a3e019c4f6745d06d7afed7991b9c682b0ea65b9.tar.gz minetest-a3e019c4f6745d06d7afed7991b9c682b0ea65b9.tar.bz2 minetest-a3e019c4f6745d06d7afed7991b9c682b0ea65b9.zip | |
Fix MSVC compiling error (argc/argv not available to pass to init_gettext)
Signed-off-by: Craig Robbins <kde.psych@gmail.com>
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 2ebdeda20..201995b5c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -157,7 +157,7 @@ static void list_game_ids(); static void list_worlds(); static void setup_log_params(const Settings &cmd_args); 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 bool read_config_file(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; - if (!init_common(&game_params.log_level, cmd_args)) + if (!init_common(&game_params.log_level, cmd_args, argc, argv)) return 1; #ifndef __ANDROID__ @@ -1086,7 +1086,7 @@ static bool create_userdata_path() 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(); set_default_settings(g_settings); |