From 6a48bed4adfbdf393399df6227bb01a59225a410 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Tue, 19 Apr 2016 23:51:57 +0100
Subject: [PATCH] organise order of preset scenery groups and paths

---
 src/rct1/S4Importer.cpp | 48 ++++++++++++++++++++++-------------------
 src/rct1/S4Importer.h   |  1 +
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/rct1/S4Importer.cpp b/src/rct1/S4Importer.cpp
index 3c80d1a6dc..b49eacbbd9 100644
--- a/src/rct1/S4Importer.cpp
+++ b/src/rct1/S4Importer.cpp
@@ -111,34 +111,38 @@ void S4Importer::Initialise()
 
 void S4Importer::CreateAvailableObjectMappings()
 {
-    // Add default scenery groups
-    _sceneryGroupEntries.AddRange({
-        "SCGTREES",
-        "SCGPATHX",
-        "SCGSHRUB",
-        "SCGGARDN",
-        "SCGFENCE",
-        "SCGWALLS"
-    });
-
-    // Add default footpaths
-    _pathEntries.AddRange({
-        "PATHASH ",
-        "PATHCRZY",
-        "PATHDIRT",
-        "PATHSPCE",
-        "TARMAC  ",
-        "TARMACB ",
-        "TARMACG ",
-        "ROAD    ",
-    });
-
+    AddDefaultEntries();
     AddAvailableEntriesFromResearchList();
     AddAvailableEntriesFromMap();
     AddAvailableEntriesFromRides();
     AddAvailableEntriesFromSceneryGroups();
 }
 
+void S4Importer::AddDefaultEntries()
+{
+    // Add default scenery groups
+    _sceneryGroupEntries.AddRange({
+        "SCGTREES",
+        "SCGSHRUB",
+        "SCGGARDN",
+        "SCGFENCE",
+        "SCGWALLS",
+        "SCGPATHX",
+    });
+
+    // Add default footpaths
+    _pathEntries.AddRange({
+        "TARMAC  ",
+        "TARMACG ",
+        "TARMACB ",
+        "PATHCRZY",
+        "PATHSPCE",
+        "PATHDIRT",
+        "PATHASH ",
+        "ROAD    ",
+    });
+}
+
 void S4Importer::AddAvailableEntriesFromResearchList()
 {
     size_t researchListCount;
diff --git a/src/rct1/S4Importer.h b/src/rct1/S4Importer.h
index f8a4a434a4..2290bd9273 100644
--- a/src/rct1/S4Importer.h
+++ b/src/rct1/S4Importer.h
@@ -53,6 +53,7 @@ private:
      * lookup tables for converting from hard coded RCT1 object types to dynamic object entries.
      */
     void CreateAvailableObjectMappings();
+    void AddDefaultEntries();
     void AddAvailableEntriesFromResearchList();
     void AddAvailableEntriesFromMap();
     void AddAvailableEntriesFromRides();