From 305b4d49576e093efce0d7fd650fb8265435fb87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Breno=20Rodrigues=20Guimar=C3=A3es?= Date: Sun, 26 Apr 2020 10:48:35 -0300 Subject: [PATCH] Fix #11469: Clear memory but dont increment buffer position (#11472) Fix a regression from #11412 that did: set_format_arg(0, rct_string_id, ...) set_format_arg(4, uint32_t, 0) ride->FormatNameTo(gCommonFormatArgs + 2) Notice it continues from byte 2, and not 8. So the `set_format_arg(4, uint32_t... )` was just for clearing memory, not for adding a new argument --- src/openrct2/paint/tile_element/Paint.Entrance.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 242ed43c5e..9df586bd02 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -165,9 +165,11 @@ static void ride_entrance_exit_paint(paint_session* session, uint8_t direction, if (!is_exit && !(tile_element->IsGhost()) && tile_element->AsEntrance()->GetRideIndex() != RIDE_ID_NULL && stationObj->ScrollingMode != SCROLLING_MODE_NONE) { + // clear next 8 bytes + Formatter::Common().Add(0).Add(0); + auto ft = Formatter::Common(); ft.Add(STR_RIDE_ENTRANCE_NAME); - ft.Add(0); if (ride->status == RIDE_STATUS_OPEN && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) {