From bfe7caacd7385e48e656445b7cc9505a453d4038 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Thu, 30 Sep 2021 08:40:58 +0200 Subject: [PATCH] Fix #15487: map animations do not work correctly in vanilla RCT2 (#15492) Co-authored-by: duncanspumpkin Co-authored-by: duncanspumpkin --- distribution/changelog.txt | 1 + src/openrct2/rct2/S6Exporter.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index ceee8213e9..14ded1411b 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -27,6 +27,7 @@ - Fix: [#15255] Tile Inspector shows banner information on walls that do not contain one. - Fix: [#15257] Chat icon shows in scenario/track editor. Other icons don't disable when deactivated in options menu. - Fix: [#15289] Unexpected behavior with duplicated banners which also caused desyncs in multiplayer. +- Fix: [#15487] Map animations do not work correctly when loading an exported SV6 file in vanilla RCT2. - Improved: [#3417] Crash dumps are now placed in their own folder. - Change: [#8601] Revert ToonTower base block fix to re-enable support blocking. - Change: [#15174] [Plugin] Deprecate the type "peep" and add support to target a specific scripting api version. diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 47ee85946f..620277ab85 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -1761,9 +1761,10 @@ void S6Exporter::ExportMapAnimations() auto& dst = _s6.map_animations[i]; dst.type = src.type; + // In RCT12MapAnimation, the x and y coordinates use big coords, while the z coordinate uses small coords. dst.x = src.location.x; dst.y = src.location.y; - dst.baseZ = src.location.z; + dst.baseZ = src.location.z / COORDS_Z_STEP; } }