mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Fix #16791: rotodrop top piece is replicated (#19970)

Browse Source 
* Fix rotodrop top piece replication issue (#16791)

* Add changelog entry

* Raise network version

* Move changelog entry
This commit is contained in:
Wenzhao Qiu
2023-04-21 08:48:17 -04:00
committed by GitHub
parent 784237202b
commit 8f0db4cb20
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contributors.md
View File

@@ -219,6 +219,7 @@ The following people are not part of the development team, but have been contrib
* Joel H. (HtotheTML) * Joel H. (HtotheTML)
* John Mulcahy (jayjay300) * John Mulcahy (jayjay300)
* Chase Percy (Chase-Percy) * Chase Percy (Chase-Percy)
* Wenzhao Qiu (qwzhaox)
## Toolchain ## Toolchain
* (Balletie) - macOS * (Balletie) - macOS

1
distribution/changelog.txt
View File

@@ -15,6 +15,7 @@
- Improved: [#19953] Add keyboard shortcut to Keyboard Shortcuts window. - Improved: [#19953] Add keyboard shortcut to Keyboard Shortcuts window.
- Fix: [#12598] Number of holes is not set correctly when saving track designs. - Fix: [#12598] Number of holes is not set correctly when saving track designs.
- Fix: [#13130] Android always defaulting to UK locale for language, currency and temperature. - Fix: [#13130] Android always defaulting to UK locale for language, currency and temperature.
- Fix: [#16791] Rotodrop top piece replicates when walls are placed around it and clearance checks are disabled (original bug).
- Fix: [#18895] Responding mechanic blocked at level crossing. - Fix: [#18895] Responding mechanic blocked at level crossing.
- Fix: [#19231] Crash due to null pointer to previously deleted banner in tile copy/paste functionality - Fix: [#19231] Crash due to null pointer to previously deleted banner in tile copy/paste functionality
- Fix: [#19296] Crash due to a race condition for parallel object loading. - Fix: [#19296] Crash due to a race condition for parallel object loading.

6
src/openrct2/ride/thrill/RotoDrop.cpp
View File

@@ -186,6 +186,12 @@ static void PaintRotoDropTowerSection(
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { 8, 8, height }, { 2, 2, 30 } }); PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { 8, 8, height }, { 2, 2, 30 } });
const TileElement* nextTileElement = reinterpret_cast<const TileElement*>(&trackElement) + 1; const TileElement* nextTileElement = reinterpret_cast<const TileElement*>(&trackElement) + 1;
while (nextTileElement->GetType() != TileElementType::Track && !nextTileElement->IsLastForTile())
{
nextTileElement++;
}
if (trackElement.IsLastForTile() || trackElement.GetClearanceZ() != nextTileElement->GetBaseZ()) if (trackElement.IsLastForTile() || trackElement.GetClearanceZ() != nextTileElement->GetBaseZ())
{ {
imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SPR_ROTO_DROP_TOWER_SEGMENT_TOP); imageId = session.TrackColours[SCHEME_TRACK].WithIndex(SPR_ROTO_DROP_TOWER_SEGMENT_TOP);