From 653be68b98300dd56d5598c4dbb46d9299eb0d52 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Sun, 15 Jan 2017 20:44:48 +0100
Subject: [PATCH] Don't assert on incorrect colour or sprite type

---
 src/openrct2/rct1/tables.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/rct1/tables.cpp b/src/openrct2/rct1/tables.cpp
index d3f03ca52c..1401746c2b 100644
--- a/src/openrct2/rct1/tables.cpp
+++ b/src/openrct2/rct1/tables.cpp
@@ -67,7 +67,11 @@ namespace RCT1
             COLOUR_BRIGHT_YELLOW,
             COLOUR_ICY_BLUE
         };
-        Guard::ArgumentInRange<size_t>(colour, 0, Util::CountOf(map), "Unsupported RCT1 colour.");
+        if (colour < 0 || colour >= Util::CountOf(map))
+        {
+            log_warning("Unsupported RCT1 colour.");
+            return COLOUR_BLACK;
+        }
         return map[colour];
     }
 
@@ -107,7 +111,11 @@ namespace RCT1
             PEEP_SPRITE_TYPE_TENTACLE,
             PEEP_SPRITE_TYPE_TOFFEE_APPLE
         };
-        Guard::ArgumentInRange<size_t>(rct1SpriteType, 0, Util::CountOf(map), "Unsupported RCT1 sprite type.");
+        if (rct1SpriteType < 0 || rct1SpriteType > Util::CountOf(map))
+        {
+            log_warning("Unsupported RCT1 sprite type.");
+            return PEEP_SPRITE_TYPE_NORMAL;
+        }
         return map[rct1SpriteType];
     }