From bc2640314e6b7d112fe50bbcac39669b3dcf7d5b Mon Sep 17 00:00:00 2001
From: Duncan Frost <duncans_pumpkin@hotmail.co.uk>
Date: Thu, 14 Aug 2014 07:22:47 +0100
Subject: [PATCH] Remove duplicate function. Change comment to prevent repeat

---
 src/gfx.c                     | 12 ------------
 src/gfx.h                     |  3 ---
 src/window.c                  |  6 +++---
 src/window_game_top_toolbar.c |  2 +-
 src/window_peep.c             |  2 +-
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/gfx.c b/src/gfx.c
index ca67b4e4cf..59350e680d 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -1235,18 +1235,6 @@ void gfx_draw_string_centred(rct_drawpixelinfo *dpi, int format, int x, int y, i
 	}
 }
 
-/**
-*
-*  rct2: 0x006EB13A
-*/
-void gfx_invalidate_window(rct_window* w)
-{
-	if (!w)return;
-	int width = w->x + w->width;
-	int height = w->y + w->height;
-	gfx_set_dirty_blocks(w->x, w->y, width, height);
-}
-
 /**
  *
  *  rct2: 0x006ED7E5
diff --git a/src/gfx.h b/src/gfx.h
index 0755f84e76..476f7420ac 100644
--- a/src/gfx.h
+++ b/src/gfx.h
@@ -92,9 +92,6 @@ void gfx_draw_all_dirty_blocks();
 void gfx_redraw_screen_rect(short left, short top, short right, short bottom);
 void gfx_invalidate_screen();
 
-typedef struct rct_window rct_window;
-void gfx_invalidate_window(rct_window *w);
-
 void gfx_draw_rain(int left, int top, int width, int height, uint32 x_start, uint32 y_start);
 
 rct_drawpixelinfo* clip_drawpixelinfo(rct_drawpixelinfo* dpi, int left, int width, int top, int height);
diff --git a/src/window.c b/src/window.c
index 62a32b1b98..266397aa43 100644
--- a/src/window.c
+++ b/src/window.c
@@ -642,7 +642,7 @@ int window_find_widget_from_point(rct_window *w, int x, int y)
 
 /**
  * Invalidates the specified window.
- *  rct2: 0x006EB31A
+ *  rct2: 0x006EB13A
  *
  * @param window The window to invalidate (esi).
  */
@@ -924,7 +924,7 @@ void window_zoom_in(rct_window *w)
 	w->saved_view_x += v->view_width >> 1;
 	w->saved_view_y += v->view_height >> 1;
 
-	gfx_invalidate_window(w);
+	window_invalidate(w);
 }
 
 /**
@@ -951,7 +951,7 @@ void window_zoom_out(rct_window *w)
 	w->saved_view_x -= width / 2;
 	w->saved_view_y -= height >> 1;
 
-	gfx_invalidate_window(w);
+	window_invalidate(w);
 }
 
 /**
diff --git a/src/window_game_top_toolbar.c b/src/window_game_top_toolbar.c
index b0c37d2687..4770f1dd01 100644
--- a/src/window_game_top_toolbar.c
+++ b/src/window_game_top_toolbar.c
@@ -447,7 +447,7 @@ static void window_game_top_toolbar_dropdown()
 			default:
 				return;
 			}
-			gfx_invalidate_window(w);
+			window_invalidate(w);
 		}
 	}
 }
diff --git a/src/window_peep.c b/src/window_peep.c
index e9d8c91524..72be7b5007 100644
--- a/src/window_peep.c
+++ b/src/window_peep.c
@@ -161,7 +161,7 @@ void window_peep_open(rct_peep* peep){
 	}
 	
 	window->page = 0;
-	gfx_invalidate_window(window);
+	window_invalidate(window);
 	
 	window->widgets = RCT2_GLOBAL(0x981D0C, rct_widget*);
 	window->enabled_widgets = RCT2_GLOBAL(0x981D3C,uint32);