[CSM] Fix minimap problems (#5405)

nerzhul · web-flow · commit 7b74f04a611d · 2017-03-17T07:54:49.000+01:00
This fixes issue #5404
diff --git a/clientmods/preview/init.lua b/clientmods/preview/init.lua
@@ -49,8 +49,8 @@ core.register_chatcommand("test_node", {
 
 local function preview_minimap()
 	local minimap = core.ui.minimap
-	minimap:show()
 	minimap:set_mode(4)
+	minimap:show()
 	minimap:set_pos({x=5, y=50, z=5})
 	minimap:toggle_shape()
 
@@ -61,9 +61,13 @@ end
 
 core.after(2, function()
 	print("[PREVIEW] loaded " .. modname .. " mod")
-	preview_minimap()
 	modstorage:set_string("current_mod", modname)
 	print(modstorage:get_string("current_mod"))
+	preview_minimap()
+end)
+
+core.after(5, function()
+	core.ui.minimap:show()
 
 	print("[PREVIEW] Day count: " .. core.get_day_count() ..
 		" time of day " .. core.get_timeofday())
diff --git a/src/client.cpp b/src/client.cpp
@@ -224,7 +224,6 @@ Client::Client(
 	m_device(device),
 	m_camera(NULL),
 	m_minimap_disabled_by_server(false),
-	m_minimap_shown_by_mod(false),
 	m_server_ser_ver(SER_FMT_VER_INVALID),
 	m_proto_ver(0),
 	m_playeritem(0),
@@ -1933,11 +1932,7 @@ void Client::makeScreenshot(IrrlichtDevice *device)
 
 bool Client::shouldShowMinimap() const
 {
-	if (m_minimap_disabled_by_server) {
-		return false;
-	}
-
-	return m_minimap_shown_by_mod;
+	return !m_minimap_disabled_by_server;
 }
 
 // IGameDef interface
diff --git a/src/client.h b/src/client.h
@@ -532,7 +532,6 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 	{ return m_camera; }
 
 	bool shouldShowMinimap() const;
-	void setMinimapShownByMod(bool state) { m_minimap_shown_by_mod = state; }
 
 	// IGameDef interface
 	virtual IItemDefManager* getItemDefManager();
@@ -634,7 +633,6 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 	Camera *m_camera;
 	Minimap *m_minimap;
 	bool m_minimap_disabled_by_server;
-	bool m_minimap_shown_by_mod;
 	// Server serialization version
 	u8 m_server_ser_ver;
 
diff --git a/src/game.cpp b/src/game.cpp
@@ -1769,7 +1769,7 @@ void Game::run()
 		updateProfilerGraphs(&graph);
 
 		// Update if minimap has been disabled by the server
-		flags.show_minimap = client->shouldShowMinimap();
+		flags.show_minimap &= client->shouldShowMinimap();
 	}
 }
 
diff --git a/src/script/lua_api/l_minimap.cpp b/src/script/lua_api/l_minimap.cpp
@@ -118,17 +118,21 @@ int LuaMinimap::l_toggle_shape(lua_State *L)
 
 int LuaMinimap::l_show(lua_State *L)
 {
-	Client *client = getClient(L);
-	assert(client);
-	client->setMinimapShownByMod(true);
+	LuaMinimap *ref = checkobject(L, 1);
+	Minimap *m = getobject(ref);
+
+	if (m->getMinimapMode() == MINIMAP_MODE_OFF)
+		m->setMinimapMode(MINIMAP_MODE_SURFACEx1);
 	return 1;
 }
 
 int LuaMinimap::l_hide(lua_State *L)
 {
-	Client *client = getClient(L);
-	assert(client);
-	client->setMinimapShownByMod(false);
+	LuaMinimap *ref = checkobject(L, 1);
+	Minimap *m = getobject(ref);
+
+	if (m->getMinimapMode() != MINIMAP_MODE_OFF)
+		m->setMinimapMode(MINIMAP_MODE_OFF);
 	return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1769,7 +1769,7 @@ void Game::run()`
`1769`	`1769`	`updateProfilerGraphs(&graph);`
`1770`	`1770`
`1771`	`1771`	`// Update if minimap has been disabled by the server`
`1772`		`- flags.show_minimap = client->shouldShowMinimap();`
	`1772`	`+ flags.show_minimap &= client->shouldShowMinimap();`
`1773`	`1773`	`}`
`1774`	`1774`	`}`
`1775`	`1775`