From b330c4032fe7288e16038fdfe91bc2ab0da4927a Mon Sep 17 00:00:00 2001
From: Tomas Dittmann <chaosmeist3r@gmail.com>
Date: Tue, 1 Aug 2017 21:45:04 +0200
Subject: [PATCH] ensure validity instead of asserting invalidity.

---
 src/openrct2/game.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/openrct2/game.c b/src/openrct2/game.c
index 15cf73c874..8ad2440d1d 100644
--- a/src/openrct2/game.c
+++ b/src/openrct2/game.c
@@ -1074,9 +1074,12 @@ void game_fix_save_vars()
         if (researchItem->entryIndex == RESEARCHED_ITEMS_SEPARATOR) continue;
         if (researchItem->entryIndex == RESEARCHED_ITEMS_END)
         {
-            assert(i < (MAX_RESEARCH_ITEMS - 1));
-            (researchItem+1)->entryIndex = RESEARCHED_ITEMS_END_2;
-            continue;
+            if (i == MAX_RESEARCH_ITEMS - 1)
+            {
+                (--researchItem)->entryIndex = RESEARCHED_ITEMS_END;
+            }
+            (++researchItem)->entryIndex = RESEARCHED_ITEMS_END_2;
+            break;
         }
         if (researchItem->entryIndex == RESEARCHED_ITEMS_END_2) break;
         if (researchItem->entryIndex & 0x10000) {