From c1ccf2b7a608d3b8c35ed8e9e6e6dc26f5671d55 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Wed, 7 Jun 2017 23:24:18 +0100
Subject: [PATCH] Refactor load_palette to call gfx_invalidate_screen

Nearly all calls to load_palette were succeeded with a call to gfx_invalidate_screen. So remove these and stick just one call inside load_palette.
---
 src/openrct2/drawing/drawing.c             | 4 +++-
 src/openrct2/editor.c                      | 4 ----
 src/openrct2/game.c                        | 1 -
 src/openrct2/intro.c                       | 1 -
 src/openrct2/object/WaterObject.cpp        | 1 -
 src/openrct2/scenario/scenario.c           | 1 -
 src/openrct2/title/TitleSequencePlayer.cpp | 1 -
 7 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/openrct2/drawing/drawing.c b/src/openrct2/drawing/drawing.c
index a488dd4344..e10403c0f5 100644
--- a/src/openrct2/drawing/drawing.c
+++ b/src/openrct2/drawing/drawing.c
@@ -515,7 +515,8 @@ void gfx_transpose_palette(sint32 pal, uint8 product)
  *
  *  rct2: 0x006837E3
  */
-void load_palette(){
+void load_palette()
+{
     rct_water_type* water_type = (rct_water_type*)object_entry_groups[OBJECT_TYPE_WATER].chunks[0];
 
     uint32 palette = 0x5FC;
@@ -539,6 +540,7 @@ void load_palette(){
         dest_pointer += 4;
     }
     platform_update_palette(gGamePalette, 10, 236);
+    gfx_invalidate_screen();
 }
 
 /**
diff --git a/src/openrct2/editor.c b/src/openrct2/editor.c
index de47e75630..210541a289 100644
--- a/src/openrct2/editor.c
+++ b/src/openrct2/editor.c
@@ -96,7 +96,6 @@ void editor_load()
     rct_window *mainWindow = window_editor_main_open();
     window_set_location(mainWindow, 2400, 2400, 112);
     load_palette();
-    gfx_invalidate_screen();
     gScreenAge = 0;
 
     safe_strcpy(gScenarioName, language_get_string(STR_MY_NEW_SCENARIO), 64);
@@ -166,7 +165,6 @@ void trackdesigner_load()
     rct_window * mainWindow = window_editor_main_open();
     window_set_location(mainWindow, 2400, 2400, 112);
     load_palette();
-    gfx_invalidate_screen();
 }
 
 /**
@@ -188,7 +186,6 @@ void trackmanager_load()
     rct_window *mainWindow = window_editor_main_open();
     window_set_location(mainWindow, 2400, 2400, 112);
     load_palette();
-    gfx_invalidate_screen();
 }
 
 /**
@@ -437,7 +434,6 @@ static void editor_finalise_main_view()
     window_new_ride_init_vars();
     gWindowUpdateTicks = 0;
     load_palette();
-    gfx_invalidate_screen();
     window_tile_inspector_clear_clipboard();
 }
 
diff --git a/src/openrct2/game.c b/src/openrct2/game.c
index c3ac4d410b..1b954e7f7a 100644
--- a/src/openrct2/game.c
+++ b/src/openrct2/game.c
@@ -1146,7 +1146,6 @@ void game_load_init()
     gWindowUpdateTicks = 0;
 
     load_palette();
-    gfx_invalidate_screen();
 
     if (!gOpenRCT2Headless) {
         window_tile_inspector_clear_clipboard();
diff --git a/src/openrct2/intro.c b/src/openrct2/intro.c
index b84c1b77ad..0106ba8656 100644
--- a/src/openrct2/intro.c
+++ b/src/openrct2/intro.c
@@ -152,7 +152,6 @@ void intro_update()
     case INTRO_STATE_FINISH:
         gIntroState = INTRO_STATE_NONE;
         load_palette();
-        gfx_invalidate_screen();
         audio_start_title_music();
         break;
     }
diff --git a/src/openrct2/object/WaterObject.cpp b/src/openrct2/object/WaterObject.cpp
index 6811f47610..2f6855aade 100644
--- a/src/openrct2/object/WaterObject.cpp
+++ b/src/openrct2/object/WaterObject.cpp
@@ -40,7 +40,6 @@ void WaterObject::Load()
     _legacyType.palette_index_2 = _legacyType.image_id + 4;
 
     load_palette();
-    gfx_invalidate_screen();
 }
 
 void WaterObject::Unload()
diff --git a/src/openrct2/scenario/scenario.c b/src/openrct2/scenario/scenario.c
index be2f7d3039..73041a6143 100644
--- a/src/openrct2/scenario/scenario.c
+++ b/src/openrct2/scenario/scenario.c
@@ -267,7 +267,6 @@ void scenario_begin()
     gParkFlags |= PARK_FLAGS_SPRITES_INITIALISED;
 
     load_palette();
-    gfx_invalidate_screen();
     window_tile_inspector_clear_clipboard();
     gScreenAge = 0;
     gGameSpeed = 1;
diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp
index 97c63b8b50..9ee1b60836 100644
--- a/src/openrct2/title/TitleSequencePlayer.cpp
+++ b/src/openrct2/title/TitleSequencePlayer.cpp
@@ -428,7 +428,6 @@ private:
         scenery_set_default_placement_configuration();
         news_item_init_queue();
         load_palette();
-        gfx_invalidate_screen();
         gScreenAge = 0;
         gGameSpeed = 1;
     }