Improved map window, moved the actual map widget into a seperate class.

1 files changed, 14 insertions, 7 deletions

diff --git a/src/client/gamewindow.h b/src/client/gamewindow.h
index 336158e..6c1ee83 100644
--- a/src/client/gamewindow.h
+++ b/src/client/gamewindow.h
@@ -10,13 +10,16 @@
 #include "ui/window.h"
 #include "ui/label.h"
 #include "ui/iconbutton.h"
+
+#include "client/hud.h"
+
 #include "client/chat.h"
+#include "client/inventorywindow.h"
+#include "client/mapwindow.h"
+
 #include "client/buymenu.h"
 #include "client/entitymenu.h"
-#include "client/inventorywindow.h"
 #include "client/trademenu.h"
-#include "client/hud.h"
-#include "client/map.h"
 
 namespace client
 {
@@ -54,15 +57,19 @@ public:
 	inline HUD *hud() {
 		return gamewindow_hud;
 	}
-	inline Map *map() {
-		return gamewindow_map;
-	}
+	
 	inline Chat *chat() {
 		return gamewindow_chat;
 	}
+	
+	inline MapWindow *map() {
+		return gamewindow_map;
+	}
+	
 	inline InventoryWindow *inventory() {
 		return gamewindow_inventory;
 	}
+	
 	inline EntityMenu *menu() {
 		return gamewindow_entitymenu;
 	}
@@ -77,7 +84,7 @@ protected:
 private:
 	HUD		*gamewindow_hud;
 	Chat		*gamewindow_chat;
-	Map		*gamewindow_map;
+	MapWindow	*gamewindow_map;
 	InventoryWindow	*gamewindow_inventory;
 
 	EntityMenu	*gamewindow_entitymenu;