From 95e1e263c649dd3d41fa7a665d094f28bf3eea06 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Mon, 30 Aug 2021 22:53:49 +0200 Subject: [PATCH] macOS: minor fixes --- builtin/mainmenu/serverlistmgr.lua | 6 ++---- src/gettext.cpp | 2 +- src/main.cpp | 2 +- textures/base/pack/creative_bg_ru.png | Bin 5351 -> 428 bytes 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/builtin/mainmenu/serverlistmgr.lua b/builtin/mainmenu/serverlistmgr.lua index cb6b3574f..28407f795 100644 --- a/builtin/mainmenu/serverlistmgr.lua +++ b/builtin/mainmenu/serverlistmgr.lua @@ -72,11 +72,9 @@ function serverlistmgr.sync() core.handle_async( function(param) local http = core.get_http_api() - local url = ("%s%s?proto_version_min=%d&proto_version_max=%d"):format( + local url = ("%s/list%s?proto_version_min=%d&proto_version_max=%d"):format( core.settings:get("serverlist_url"), - (PLATFORM == "Android" or PLATFORM == "iOS") and - core.decode_base64("OjMwMDAvc2VydmVybGlzdC5qc29u") or - core.decode_base64("L2xpc3Q"), + (PLATFORM == "Android" or PLATFORM == "iOS" or PLATFORM == "OSX") and "_prod" or "", core.get_min_supp_proto(), core.get_max_supp_proto()) diff --git a/src/gettext.cpp b/src/gettext.cpp index 3cc3b7656..75b2b0a16 100644 --- a/src/gettext.cpp +++ b/src/gettext.cpp @@ -136,7 +136,7 @@ void init_gettext(const char *path, const std::string &configured_language, // Add user specified locale to environment setenv("LANGUAGE", configured_language.c_str(), 1); -#ifdef __ANDROID__ +#if defined(__ANDROID__) || defined(__APPLE__) setenv("LANG", configured_language.c_str(), 1); #endif diff --git a/src/main.cpp b/src/main.cpp index 78c2167fe..150e6aecf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -804,7 +804,7 @@ static bool determine_subgame(GameParams *game_params) gamespec = findSubgame(g_settings->get("default_game")); infostream << "Using default gameid [" << gamespec.id << "]" << std::endl; if (!gamespec.isValid()) { - errorstream << "Game specified in default_game [" + warningstream << "Game specified in default_game [" << g_settings->get("default_game") << "] is invalid." << std::endl; return false; diff --git a/textures/base/pack/creative_bg_ru.png b/textures/base/pack/creative_bg_ru.png index 7a32cd79291652dcb4ade7a4a65be3ed7fd5634c..601e5040b054e8bd18c80579cc8a9ed873f3af3a 100644 GIT binary patch delta 414 zcmaE^xrTXyL_G^L0|SGou)#VY#UJ1k;tHfqE$j{)IPm}f|G46nB42FJ0)-e$g8YIR z9G=}s1G2q6T^vIy7~kG$^gLo9as1+%2VCn4wD0^g?qpf<@qT}Yqfg&=<_#Ckrm@F3 zJ-nsjISGu?zm!D_n`F2zVyxc(*2E&?!h)5}w)J_h3w+%dIySSt4cw-D>+|M^3{oZ; z7bfK}n`K;>=WM+p_e&?6ZZjJ%Q1oz=K2Vcm^S9Ltj{bZ6+TfoQd*R2>-``&Ev08rC zv#VOG?ubQNybDC}g{DNKKQC_{zLI&pyD&d1dg0M4&LGX(y2P^21oVYpsIp${xO-N; z)UjnrE8MbkCD-2IIGWp@Bl=t;=PEHVOHy=t{S^Hme3(qa53*Y{~Qrg05lF{@`R2XRL sBB!`WKka9~?1*@qNJ1cA&SUA;(maOjaveBMY8 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 E1u1cSMgRZ+