From 90b7174a21b3e45ac2e8dc0ee3c0e7c6eb8c5195 Mon Sep 17 00:00:00 2001
From: ddevrien <dennis@devriendt.eu>
Date: Wed, 14 May 2014 12:49:40 +0200
Subject: [PATCH] map window basic stuff done

---
 src/window.h                  |  1 +
 src/window_game_top_toolbar.c |  4 ++--
 src/window_map.c              | 19 ++++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/window.h b/src/window.h
index 3a21c90257..eb1521c6e2 100644
--- a/src/window.h
+++ b/src/window.h
@@ -346,6 +346,7 @@ void window_clear_scenery_open();
 void window_land_open();
 void window_water_open();
 void window_guest_list_open();
+void window_map_open();
 void window_options_open();
 void window_park_awards_open();
 void window_park_entrance_open();
diff --git a/src/window_game_top_toolbar.c b/src/window_game_top_toolbar.c
index 9e2ed385fa..5c4819ff0f 100644
--- a/src/window_game_top_toolbar.c
+++ b/src/window_game_top_toolbar.c
@@ -171,9 +171,9 @@ static void window_game_top_toolbar_mouseup()
 			window_rotate_camera(mainWindow);
 		break;
 	case WIDX_MAP:
-		RCT2_CALLPROC_EBPSAFE(0x0068C88A);
+		//RCT2_CALLPROC_EBPSAFE(0x0068C88A);
+		window_map_open();
 		break;
-
 	case WIDX_CLEAR_SCENERY:
 		if ((RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3)) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 16) {
 			tool_cancel();
diff --git a/src/window_map.c b/src/window_map.c
index 79719deb93..4d50d0cecb 100644
--- a/src/window_map.c
+++ b/src/window_map.c
@@ -57,11 +57,11 @@ static void* window_map_events[] = {
 	window_map_update,
 	window_map_emptysub,
 	window_map_emptysub,
-	0x0068D093,
-	0x0068D074,
-	0x0068D088,
+	(void*)0x0068D093,
+	(void*)0x0068D074,
+	(void*)0x0068D088,
 	window_map_emptysub,
-	0x0068D055,
+	(void*)0x0068D055,
 	window_map_emptysub,
 	window_map_scrollgetsize,
 	window_map_scrollmousedown,
@@ -70,7 +70,7 @@ static void* window_map_events[] = {
 	window_map_emptysub,
 	window_map_emptysub,
 	window_map_emptysub,
-	0x0068D140,
+	(void*)0x0068D140,
 	window_map_emptysub,
 	window_map_emptysub,
 	window_map_invalidate,
@@ -93,6 +93,15 @@ void window_map_open()
 	//	return;
 }
 
+/**
+*
+*  rct2: 0x0068D0F1
+*/
+static void window_map_close()
+{
+	RCT2_CALLPROC_EBPSAFE(0x0068D0F1);
+}
+
 /**
 *
 *  rct2: 0x006BAFCA