From 55977997fddaf034e0c60577c6e8dba1e5de0272 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 23 Jun 2017 23:17:22 +0200 Subject: [PATCH] Fix #1705: Time Twister's Medieval entrance has incorrect scrolling --- distribution/changelog.txt | 3 ++- src/openrct2/object/EntranceObject.cpp | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 52a1f5108b..d61a7ac150 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -8,8 +8,9 @@ - Feature: OpenRCT2 now starts up on the display it was last shown on. - Feature: [#5611] Add support for Android - Improved: Mouse can now be dragged to select scenery when saving track designs -- Fix: [#739] Crocodile Ride (Log Flume) never allows more than five boats +- Fix: [#739] Crocodile Ride (Log Flume) never allows more than five boats (original bug) - Fix: [#837] Can't move windows on title screen to where the toolbar would be +- Fix: [#1705] Time Twister's Medieval entrance has incorrect scrolling (original bug) - Fix: [#3178, #5456] Paths with non-ASCII characters not handled properly on macOS. - Fix: [#3681] Steel Twister rollercoaster always shows all track designs - Fix: [#4054] Sorting rides by track type: Misleading research messages diff --git a/src/openrct2/object/EntranceObject.cpp b/src/openrct2/object/EntranceObject.cpp index d3154e3c8e..96ccdf0dc8 100644 --- a/src/openrct2/object/EntranceObject.cpp +++ b/src/openrct2/object/EntranceObject.cpp @@ -15,6 +15,7 @@ #pragma endregion #include "../core/IStream.hpp" +#include "../core/String.hpp" #include "EntranceObject.h" extern "C" @@ -31,6 +32,14 @@ void EntranceObject::ReadLegacy(IReadObjectContext * context, IStream * stream) GetStringTable()->Read(context, stream, OBJ_STRING_ID_NAME); GetImageTable()->Read(context, stream); + + // Fix issue #1705: The Medieval entrance from Time Twister has a straight banner, + // but scrolls its text as if it a curved one. + if (String::Equals(GetIdentifier(), "MEDIENTR")) + { + _legacyType.scrolling_mode = 32; + _legacyType.text_height += 1; + } } void EntranceObject::Load()