From 3f294daf23a7b3bea2bb4932739082a238411506 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 21 Apr 2021 22:13:29 +0200 Subject: [PATCH] Update path names --- src/openrct2/rct1/S4Importer.cpp | 6 +++--- src/openrct2/rct1/Tables.cpp | 10 +++++----- src/openrct2/rct2/S6Importer.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 29f658b4e8..edc8b8a32e 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -410,11 +410,11 @@ private: { "rct1.pathsurface.tarmac", "rct1.pathsurface.dirt", "rct1.pathsurface.crazy", "rct1.pathsurface.tile.brown", "rct1.aa.pathsurface.ash", "rct1.aa.pathsurface.tarmac.green", "rct1.aa.pathsurface.tarmac.brown", "rct1.aa.pathsurface.tile.grey", "rct1.aa.pathsurface.space", "rct1.ll.pathsurface.tile.green", - "rct1.ll.pathsurface.tile.red", "rct1.pathsurface.queue.blue", "rct1.pathsurface.queue.red", - "rct1.pathsurface.queue.yellow", "rct1.pathsurface.queue.green" }); + "rct1.ll.pathsurface.tile.red", "rct1.pathsurface.queue.blue", "rct1.aa.pathsurface.queue.red", + "rct1.aa.pathsurface.queue.yellow", "rct1.aa.pathsurface.queue.green" }); _footpathRailingsEntries.AddRange( - { "rct2.railings.wood", "rct1.railings.space", "rct1.railings.bamboo", "rct2.railings.concrete" }); + { "rct2.railings.wood", "rct1.ll.railings.space", "rct1.ll.railings.bamboo", "rct2.railings.concrete" }); } void AddAvailableEntriesFromResearchList() diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index 50021b319e..b0db62b04b 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -1257,9 +1257,9 @@ namespace RCT1 static constexpr const char * map[] = { "rct1.pathsurface.queue.blue", // RCT1_FOOTPATH_TYPE_QUEUE_BLUE - "rct1.pathsurface.queue.red", // RCT1_FOOTPATH_TYPE_QUEUE_RED - "rct1.pathsurface.queue.yellow", // RCT1_FOOTPATH_TYPE_QUEUE_YELLOW - "rct1.pathsurface.queue.green", // RCT1_FOOTPATH_TYPE_QUEUE_GREEN + "rct1.aa.pathsurface.queue.red", // RCT1_FOOTPATH_TYPE_QUEUE_RED + "rct1.aa.pathsurface.queue.yellow", // RCT1_FOOTPATH_TYPE_QUEUE_YELLOW + "rct1.aa.pathsurface.queue.green", // RCT1_FOOTPATH_TYPE_QUEUE_GREEN "rct1.pathsurface.tarmac", // RCT1_FOOTPATH_TYPE_TARMAC_GRAY "rct1.aa.pathsurface.space", // RCT1_FOOTPATH_TYPE_TARMAC_RED @@ -1318,8 +1318,8 @@ namespace RCT1 { "rct2.railings.wood", // RCT1_PATH_SUPPORT_TYPE_TRUSS "rct2.railings.concrete", // RCT1_PATH_SUPPORT_TYPE_COATED_WOOD - "rct1.railings.space", // RCT1_PATH_SUPPORT_TYPE_SPACE - "rct1.railings.bamboo", // RCT1_PATH_SUPPORT_TYPE_BAMBOO + "rct1.ll.railings.space", // RCT1_PATH_SUPPORT_TYPE_SPACE + "rct1.ll.railings.bamboo", // RCT1_PATH_SUPPORT_TYPE_BAMBOO }; return map[footpathRailingsType]; } diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 37afe8a988..9d06d58365 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1654,11 +1654,11 @@ public: { auto name = desc.Entry.GetName(); if (name == "PATHASH ") - return { "rct2.pathsurface.ash", "rct2.pathsurface.queue.yellow", "rct2.railings.black" }; + return { "rct2.pathsurface.ash", "rct2.pathsurface.queue.yellow", "rct2.railings.bambooblack" }; else if (name == "PATHCRZY") return { "rct2.pathsurface.crazy", "rct2.pathsurface.queue.yellow", "rct2.railings.concrete" }; else if (name == "PATHDIRT") - return { "rct2.pathsurface.dirt", "rct2.pathsurface.queue.yellow", "rct2.railings.brown" }; + return { "rct2.pathsurface.dirt", "rct2.pathsurface.queue.yellow", "rct2.railings.bamboobrown" }; else if (name == "PATHSPCE") return { "rct2.pathsurface.space", "rct2.pathsurface.queue.red", "rct2.railings.space" }; else if (name == "ROAD ")