From 2f382ddee2c57a3e7f2ec45e0d95665f8cd6171e Mon Sep 17 00:00:00 2001 From: luk3yx Date: Sat, 16 Feb 2019 17:34:26 +1300 Subject: [PATCH] =?UTF-8?q?Bugfixes=20=20=E2=80=A2=20Fix=20more=20compilat?= =?UTF-8?q?ion=20errors.=20=20=E2=80=A2=20Hacky=20workarounds=20to=20get?= =?UTF-8?q?=20content.minetest.net=20to=20send=20a=200.4-compatible=20mod?= =?UTF-8?q?=20list.=20=20=20=20=C2=B7=20Send=20the=20maximum=20protocol=20?= =?UTF-8?q?version=20of=200=20(instead=20of=2033)=20to=20work=20around=20a?= =?UTF-8?q?=20bug(=3F)=20on=20content.minetest.net.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- builtin/mainmenu/dlg_contentstore.lua | 4 +++- src/game.cpp | 1 - src/unittest/test.cpp | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua index a8dc072d5..9cef748fd 100644 --- a/builtin/mainmenu/dlg_contentstore.lua +++ b/builtin/mainmenu/dlg_contentstore.lua @@ -285,7 +285,9 @@ function store.load() local show_nonfree = core.settings:get_bool("show_nonfree_packages") local url = base_url .. "/api/packages/?type=mod&type=game&type=txp&protocol_version=" .. - core.get_max_supp_proto() + 0 + -- Hackiness to work around a bug(?) in content.minetest.net. + -- Original value: core.get_max_supp_proto() for _, item in pairs(core.settings:get("contentdb_flag_blacklist"):split(",")) do item = item:trim() diff --git a/src/game.cpp b/src/game.cpp index 2b6c4ca99..6af81c76e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -52,7 +52,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "server.h" #include "settings.h" #include "sky.h" -#include "subgame.h" #include "tool.h" #include "util/basic_macros.h" #include "util/directiontables.h" diff --git a/src/unittest/test.cpp b/src/unittest/test.cpp index 98acf5efa..9e221342b 100644 --- a/src/unittest/test.cpp +++ b/src/unittest/test.cpp @@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "nodedef.h" #include "itemdef.h" #include "gamedef.h" -#include "mods.h" #include "content/mods.h" #include "util/numeric.h"