From 40ce538aad9af8f7634c4ba7e9f12246fb23b31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Blot?= <nerzhul@users.noreply.github.com>
Date: Thu, 16 Mar 2017 10:34:54 +0100
Subject: [CSM] Add minimap API modifiers (#5399)

* Rename Mapper (too generic) to Minimap
* Add lua functions to get/set position, angle, mode for minimap
* Client: rename m_mapper to m_minimap
* Add minimap to core.ui namespace (core.ui.minimap)
* Add various functions to manage minimap (show, hide, toggle_shape)
* Cleanup trivial declaration in client
---
 src/client.h | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'src/client.h')

diff --git a/src/client.h b/src/client.h
index d72249315..5c8a0ae25 100644
--- a/src/client.h
+++ b/src/client.h
@@ -49,7 +49,7 @@ struct MapDrawControl;
 class MtEventManager;
 struct PointedThing;
 class Database;
-class Mapper;
+class Minimap;
 struct MinimapMapblock;
 class Camera;
 class NetworkPacket;
@@ -522,21 +522,17 @@ public:
 
 	void afterContentReceived(IrrlichtDevice *device);
 
-	float getRTT(void);
-	float getCurRate(void);
-	float getAvgRate(void);
+	float getRTT();
+	float getCurRate();
 
-	Mapper* getMapper ()
-	{ return m_mapper; }
-
-	void setCamera(Camera* camera)
-	{ m_camera = camera; }
+	Minimap* getMinimap() { return m_minimap; }
+	void setCamera(Camera* camera) { m_camera = camera; }
 
 	Camera* getCamera ()
 	{ return m_camera; }
 
-	bool isMinimapDisabledByServer()
-	{ return m_minimap_disabled_by_server; }
+	bool shouldShowMinimap() const;
+	void setMinimapShownByMod(bool state) { m_minimap_shown_by_mod = state; }
 
 	// IGameDef interface
 	virtual IItemDefManager* getItemDefManager();
@@ -636,8 +632,9 @@ private:
 	con::Connection m_con;
 	IrrlichtDevice *m_device;
 	Camera *m_camera;
-	Mapper *m_mapper;
+	Minimap *m_minimap;
 	bool m_minimap_disabled_by_server;
+	bool m_minimap_shown_by_mod;
 	// Server serialization version
 	u8 m_server_ser_ver;
 
-- 
cgit v1.2.3