From 85557d169df358ab60609457bd747d8e951e81f0 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Fri, 3 Jun 2016 00:29:02 +0100
Subject: [PATCH] reinstate all drawing and fix resize

---
 src/drawing/engines/SoftwareDrawingEngine.cpp | 11 ++++++++---
 src/interface/window.c                        |  6 +++---
 src/openrct2.c                                |  2 +-
 src/rct2.c                                    |  4 ++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/drawing/engines/SoftwareDrawingEngine.cpp b/src/drawing/engines/SoftwareDrawingEngine.cpp
index 42c1b02dd3..a79debd2de 100644
--- a/src/drawing/engines/SoftwareDrawingEngine.cpp
+++ b/src/drawing/engines/SoftwareDrawingEngine.cpp
@@ -22,6 +22,7 @@ extern "C"
 {
     #include "../../config.h"
     #include "../drawing.h"
+    #include "../../interface/window.h"
 }
 
 struct DirtyGrid
@@ -75,9 +76,6 @@ public:
 
     void Resize(uint32 width, uint32 height) override
     {
-        _width = width;
-        _height = height;
-
         SDL_FreeSurface(_surface);
         SDL_FreeSurface(_RGBASurface);
         SDL_FreePalette(_palette);
@@ -152,7 +150,14 @@ public:
 
     void Draw() override
     {
+        redraw_rain();
+
         DrawAllDirtyBlocks();
+        window_update_all_viewports();
+        DrawAllDirtyBlocks();
+        window_update_all();
+
+        rct2_draw();
         Display();
     }
 
diff --git a/src/interface/window.c b/src/interface/window.c
index 6966e655cc..20805f1d6f 100644
--- a/src/interface/window.c
+++ b/src/interface/window.c
@@ -157,9 +157,9 @@ void window_update_all()
 {
 	RCT2_GLOBAL(0x009E3CD8, sint32)++;
 
-	gfx_draw_all_dirty_blocks();
-	window_update_all_viewports();
-	gfx_draw_all_dirty_blocks();
+	// gfx_draw_all_dirty_blocks();
+	// window_update_all_viewports();
+	// gfx_draw_all_dirty_blocks();
 
 	// 1000 tick update
 	RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_UPDATE_TICKS, sint16) += gTicksSinceLastUpdate;
diff --git a/src/openrct2.c b/src/openrct2.c
index 5c900b3da9..98da7704fc 100644
--- a/src/openrct2.c
+++ b/src/openrct2.c
@@ -418,7 +418,7 @@ static void openrct2_loop()
 			}
 
 			if ((SDL_GetWindowFlags(gWindow) & (SDL_WINDOW_MINIMIZED | SDL_WINDOW_HIDDEN)) == 0) {
-				rct2_draw();
+				// rct2_draw();
 				platform_draw();
 			}
 
diff --git a/src/rct2.c b/src/rct2.c
index 52f7456f08..491b9d533f 100644
--- a/src/rct2.c
+++ b/src/rct2.c
@@ -279,8 +279,8 @@ void rct2_draw()
 		return;
 	}
 
-	redraw_rain();
-	window_update_all();
+	// redraw_rain();
+	// window_update_all();
 	gfx_invalidate_pickedup_peep();
 	gfx_draw_pickedup_peep();
 	update_rain_animation();