From c5e966292bce4a74c188f370e0073f75ac6ddfab Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Tue, 2 Jan 2018 16:05:39 +0100 Subject: [PATCH] Fix #3171: Guests entering from the corner of the tile in Amity Airfield --- distribution/changelog.txt | 1 + src/openrct2/rct2/S6Importer.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index bed26806dc..1c9f1e412b 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -40,6 +40,7 @@ - Fix: [#1833, #4937, #6138] 'Too low!' warning when building rides and shops on the lowest land level (original bug). - Fix: [#2254] Edge scrolling horizontally now has the same speed as vertical edge scrolling. - Fix: [#2607] Rain rendered incorrectly in additional viewport. +- Fix: [#3171] Guests entering from the corner of the tile in Amity Airfield (original bug). - Fix: [#4760] Asia - Great Wall of China and South America - Rio Carnival have incorrect guest entry points (original bug). - Fix: [#4991] Inverted helices can be built on the Lay Down RC, but are not drawn. - Fix: [#5190] Cannot build Wild Mouse - Flying Dutchman Gold Mine. diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 073449055d..6b56e99f02 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -735,6 +735,11 @@ public: } else { + // Amity Airfield has peeps entering from the corner of the tile, instead of the middle. + if (String::Equals(_s6.scenario_filename, "Amity Airfield.SC6")) + _s6.peep_spawns[0].y += 16; + + for (size_t i = 0; i < RCT12_MAX_PEEP_SPAWNS; i++) { gPeepSpawns[i] = _s6.peep_spawns[i];