From 785a6ac850752596de2cd4fd3f86354cb27939dd Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Tue, 20 Dec 2016 17:36:00 +0000
Subject: [PATCH] Fix loading of RCT1 parks from command line

---
 src/object/ObjectManager.cpp | 5 +++++
 src/rct2.c                   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/object/ObjectManager.cpp b/src/object/ObjectManager.cpp
index 472b580b04..c2d5495575 100644
--- a/src/object/ObjectManager.cpp
+++ b/src/object/ObjectManager.cpp
@@ -45,6 +45,11 @@ public:
         Guard::ArgumentNotNull(objectRepository);
 
         _objectRepository = objectRepository;
+        _loadedObjects = Memory::AllocateArray<Object *>(OBJECT_ENTRY_COUNT);
+        for (size_t i = 0; i < OBJECT_ENTRY_COUNT; i++)
+        {
+            _loadedObjects[i] = nullptr;
+        }
 
         UpdateLegacyLoadedObjectList();
         UpdateSceneryGroupIndexes();
diff --git a/src/rct2.c b/src/rct2.c
index 9cf87346a4..48f7f7ef46 100644
--- a/src/rct2.c
+++ b/src/rct2.c
@@ -377,10 +377,12 @@ bool rct2_open_file(const char *path)
 	} else if (_stricmp(extension, "sv4") == 0) {
 		if (rct1_load_saved_game(path)) {
 			game_load_init();
+			return true;
 		}
 	} else if (_stricmp(extension, "sc4") == 0) {
 		if (rct1_load_scenario(path)) {
 			scenario_begin();
+			return true;
 		}
 	}