From: Loïc Blot <loic.blot@unix-experience.fr>
Date: Wed, 29 Mar 2017 13:50:22 +0000 (+0200)
Subject: l_minimap: don't show minimap if configuration doesn't allow it
X-Git-Tag: 0.4.16~340
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fbc1432fe8e821f58e97a5f35340efb2f46f93e4;p=oweals%2Fminetest.git

l_minimap: don't show minimap if configuration doesn't allow it
---

diff --git a/src/script/lua_api/l_minimap.cpp b/src/script/lua_api/l_minimap.cpp
index 8e03936a7..182894f4f 100644
--- a/src/script/lua_api/l_minimap.cpp
+++ b/src/script/lua_api/l_minimap.cpp
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_internal.h"
 #include "common/c_converter.h"
 #include "minimap.h"
+#include "settings.h"
 
 LuaMinimap::LuaMinimap(Minimap *m)
 {
@@ -118,6 +119,10 @@ int LuaMinimap::l_toggle_shape(lua_State *L)
 
 int LuaMinimap::l_show(lua_State *L)
 {
+	// If minimap is disabled by config, don't show it.
+	if (!g_settings->getBool("enable_minimap"))
+		return 1;
+
 	Client *client = getClient(L);
 	assert(client);