From 73efe0755dbb73574db3f028da377c717e0a23fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur@gmail.com>
Date: Mon, 24 Apr 2017 22:56:37 +0200
Subject: [PATCH] Validate water image id while loading palette

---
 src/openrct2/drawing/drawing.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/openrct2/drawing/drawing.c b/src/openrct2/drawing/drawing.c
index 76058568d3..80116fe69f 100644
--- a/src/openrct2/drawing/drawing.c
+++ b/src/openrct2/drawing/drawing.c
@@ -15,6 +15,7 @@
 #pragma endregion
 
 #include "../common.h"
+#include "../core/Guard.hpp"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
 #include "../object.h"
@@ -518,7 +519,8 @@ void load_palette(){
 
 	uint32 palette = 0x5FC;
 
-	if ((intptr_t)water_type != -1){
+	if ((intptr_t)water_type != -1) {
+		openrct2_assert(water_type->image_id != (uint32)-1, "Failed to load water palette");
 		palette = water_type->image_id;
 	}