mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Fix #18134: Photo section clips through terrain

Browse Source
This commit is contained in:
Rik Smeets
2022-10-05 20:35:37 +02:00
committed by GitHub
parent 4aabc00335
commit 8ea34a5360
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -2,6 +2,7 @@
------------------------------------------------------------------------
- Fix: [#14312] Research ride type message incorrect.
- Fix: [#18122] Ghosts count towards “Great scenery!” guest thought.
- Fix: [#18134] Underground on-ride photo section partially clips through adjacent terrain edge.
0.4.2 (2022-10-05)
------------------------------------------------------------------------

24
src/openrct2/ride/TrackPaint.cpp
View File

@@ -2067,23 +2067,23 @@ void track_paint_util_onride_photo_small_paint(
{
case 0:
PaintAddImageAsParent(session, imageId, { 26, 0, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 26, 31, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 26, 28, height - 3 }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 6, 0, height }, { 1, 1, 19 });
break;
case 1:
PaintAddImageAsParent(session, imageId, { 0, 6, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 31, 6, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 28, 6, height - 3 }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 0, 26, height }, { 1, 1, 19 });
break;
case 2:
PaintAddImageAsParent(session, imageId, { 6, 0, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 6, 31, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 26, 31, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 6, 28, height - 3 }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 26, 28, height - 3 }, { 1, 1, 19 });
break;
case 3:
PaintAddImageAsParent(session, imageId, { 0, 26, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 31, 26, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 31, 6, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 28, 26, height - 3 }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 28, 6, height - 3 }, { 1, 1, 19 });
break;
}
}
@@ -2105,23 +2105,23 @@ void track_paint_util_onride_photo_paint(
{
case 0:
PaintAddImageAsParent(session, imageId, { 26, 0, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 26, 31, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 26, 28, height - 3 }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 6, 0, height }, { 1, 1, 19 });
break;
case 1:
PaintAddImageAsParent(session, imageId, { 0, 6, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 31, 6, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 28, 6, height - 3 }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 0, 26, height }, { 1, 1, 19 });
break;
case 2:
PaintAddImageAsParent(session, imageId, { 6, 0, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 6, 31, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 26, 31, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 6, 28, height - 3 }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 26, 28, height - 3 }, { 1, 1, 19 });
break;
case 3:
PaintAddImageAsParent(session, imageId, { 0, 26, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 31, 26, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 31, 6, height }, { 1, 1, 19 });
PaintAddImageAsParent(session, imageId, { 28, 26, height - 3 }, { 1, 1, 19 });
PaintAddImageAsParent(session, flashImageId, { 28, 6, height - 3 }, { 1, 1, 19 });
break;
}
}