Skip to content

Fix: Sides of River Rapids’ corners overlay other parts of the track#17316

Merged
rik-smeets merged 21 commits into
OpenRCT2:developfrom
karst:river-rapids-fix
Oct 13, 2022
Merged

Fix: Sides of River Rapids’ corners overlay other parts of the track#17316
rik-smeets merged 21 commits into
OpenRCT2:developfrom
karst:river-rapids-fix

Conversation

@karst

@karst karst commented Jun 2, 2022

Copy link
Copy Markdown
Member

Before:
image

After:
image

Comment thread src/openrct2/ride/water/RiverRapids.cpp
@Gymnasiast Gymnasiast added the testing required PR needs to be tested before it is merged. label Jun 4, 2022
@tupaschoal tupaschoal requested a review from Broxzier June 8, 2022 02:55
@Gymnasiast Gymnasiast changed the title Fix: Sides of "river rapids" corners overlaying itself. Fix: Sides of River Rapids’ corners overlay other parts of the track Jun 9, 2022
@Gymnasiast Gymnasiast added the squash merge A PR that should be squashed on merge. label Jun 9, 2022
@Gymnasiast

Gymnasiast commented Jun 9, 2022

Copy link
Copy Markdown
Member

The track still peeps through here:

afbeelding

And here:
afbeelding

@karst

karst commented Jun 9, 2022

Copy link
Copy Markdown
Member Author

Lemme check what the issue is there

@karst

karst commented Jun 9, 2022

Copy link
Copy Markdown
Member Author

I didn't recreate your setup correctly, I now have and found the issues aswell. Ignore previous two commits for now
image

@karst

karst commented Jun 9, 2022

Copy link
Copy Markdown
Member Author

There we go, now that's fixed. Let me know if you have found any more issues.

@Gymnasiast

Gymnasiast commented Jun 19, 2022

Copy link
Copy Markdown
Member

This little corner on Ropey Rapids still peeps through every so often:

afbeelding

Also, please do not merge your old branch back into the rebased one. Overwrite your local branch with the rebased one first, and then do your changes.

@karst

karst commented Jun 20, 2022

Copy link
Copy Markdown
Member Author

I have fixed that issue now on my local branch (was changing the height of that tile from 7 to 5, simple fix).

I have ran into this, before I am pushing this fix. When I pull the changes from github automatically (using the github app) it creates this commit.
image

I don't believe this is an issue, but because of your previous mention I want to be cautious that I did it correctly.

@karst

karst commented Jun 20, 2022

Copy link
Copy Markdown
Member Author

image
I found another one, this only happens when a vehicle comes by it. I accidentally paused on this spot, is how I found this out.

@karst karst force-pushed the river-rapids-fix branch from ea368ad to 3dc7269 Compare June 20, 2022 17:33
karst added 5 commits June 20, 2022 19:44
Fixes SPR_RIVER_RAPIDS_LEFT_QUARTER_TURN_1_TILE_FRONT_NE_SE
I'll work on the issue I just found right away
@karst karst force-pushed the river-rapids-fix branch from 584a720 to d8d03e1 Compare June 20, 2022 17:44
Comment thread distribution/changelog.txt Outdated
Comment thread src/openrct2/ride/water/RiverRapids.cpp
@karst

karst commented Jul 14, 2022

Copy link
Copy Markdown
Member Author

Is it perhaps an idea, since we are close to the start of 0.4.2, to get this merged? It seems I can't get anyone to extensively test this beside myself. Though I doubt anyone has abused the original glitches to their advantage, and if any it'd be incredibly minor. If we get too many complaints about it not working out (which I don't expect) we can always revert the changes or adjust the parameters accordingly.

@Broxzier Broxzier removed their request for review August 16, 2022 19:48
@karst

karst commented Sep 6, 2022

Copy link
Copy Markdown
Member Author

Does this PR need any more work? Or are we getting to close to a release to merge this currently?

@rik-smeets rik-smeets self-assigned this Sep 27, 2022
@rik-smeets rik-smeets self-requested a review September 27, 2022 17:53
@rik-smeets

Copy link
Copy Markdown
Contributor

When testing, I noticed a remaining issue. You can reproduce this with the standard Ropey Rapids design. Could you perchance fix this one too?

River rapids

@karst

karst commented Sep 27, 2022

Copy link
Copy Markdown
Member Author

Seems like that's an error in the side of the straight piece, I'll take a look at it. I am sure we have missed more but it should definitely make the rapids look a lot cleaner.

@rik-smeets

rik-smeets commented Sep 28, 2022

Copy link
Copy Markdown
Contributor

There's still some glitching going on at the same spot. It's different though. Could you take another look?

River rapids 2

There's also some new glitching with scenery possible. This wasn't the case before. It wasn't perfect before either: the tree should appear before the side of the track. But the boats didn't glitch through.

Before (current develop):
Glitch with scenery before

After (this PR):
Glitch with scenery after

@karst

karst commented Oct 8, 2022

Copy link
Copy Markdown
Member Author

All I did was rebasing but that seemed to have fixed the first mentioned issue...
https://i.gyazo.com/adccbb083f17270a62a5d0c6ba851bbc.gif

I am now gonna look into the tree issue.

karst and others added 4 commits October 8, 2022 03:06
reintroduces the old bug, without the causing new glitching this time.

I feel thisone is up for someone else to fix.
@rik-smeets rik-smeets added this to the v0.4.3 milestone Oct 13, 2022
@rik-smeets rik-smeets merged commit 46fa09c into OpenRCT2:develop Oct 13, 2022
@karst karst deleted the river-rapids-fix branch November 26, 2022 17:30
Gymnasiast added a commit that referenced this pull request Dec 14, 2022
- Feature: [#17782] The Flying Coaster now has access to boosters and can draw outside loops.
- Feature: [#17997] The Log Flume can now draw steep pieces down (if vehicle allows it).
- Feature: [#18312, objects#220, OpenSFX#13] New sound effects for the Hybrid and Single Rail roller coasters.
- Feature: [#18675] [Plugin] Plugins can refer to g2 image icons by name.
- Feature: [objects#173] Add alpine coaster vehicle.
- Feature: [objects#221] Add two extra jungle walls.
- Feature: [objects#225] Add log cabin roofs.
- Feature: [OpenMusic#14, OpenMusic#15, OpenMusic#18] Added Galaxy, Acid and Dodgems ride music styles.
- Improved: [#18013, #18016, #18018, #18019, #18514, objects#224] Added colour presets to Spiral Slide, Dodgems, Boat Hire, Flying Saucers, and Car Ride.
- Improved: [#18024] Clearer error messages when loading incompatible .park files.
- Improved: [#18192] Tycoon Park has been added to the Extras tab.
- Improved: [#18214] Competition scenarios have received their own section.
- Improved: [#18250] Added modern style file and folder pickers on Windows.
- Improved: [#18332] Allow Inverted Roller Coaster to draw boosters.
- Improved: [#18350] Changed ride vehicle list to have less padding.
- Improved: [#18422] Allow adding images to music objects.
- Improved: [#18428] [Plugin] Add widget description interfaces to documentation.
- Improved: [#18487] Mini Helicopters track can now draw spinning tunnels.
- Improved: [#18591] Order RollerCoaster Tycoon 2 scenarios by difficulty.
- Improved: [#18607] A new tab for all UCES Scenarios, if it’s installed.
- Improved: [#18621] OpenGL performance.
- Change: [#17677] Open campaign window from finished campaign news.
- Change: [#17998] Show cursor when using inverted mouse dragging.
- Change: [#18230] Make the large flat to steep pieces available on the corkscrew roller coaster without cheats.
- Change: [#18381] Convert custom invisible paths to the built-in ones.
- Change: [OpenSFX#11, OpenMusic#19] First implementation of official replacement asset packs for sound effects & music.
- Fix: [#1491] Clearance of the Cash Machine is too low (original bug).
- Fix: [#1519] “See-through rides” doesn't affect all rides (original bug).
- Fix: [#6341] “Unlock vehicle limits” does not allow setting fewer vehicles than the vehicle type requires.
- Fix: [#14312] Research ride type message incorrect.
- Fix: [#14425] Ride ratings do not skip unallocated ride ids.
- Fix: [#15969] Guests heading for ride use vanilla behaviour
- Fix: [#17067] Random Staff Patrol Area clicks.
- Fix: [#17316] Sides of River Rapids’ corners overlay other parts of the track.
- Fix: [#17657] When switching from buying land rights to buying construction rights, grid disables and won't re-enable afterwards.
- Fix: [#17763] Missing validation on invalid characters in file name.
- Fix: [#17853] Invention name tears while being dragged.
- Fix: [#18064] Unable to dismiss notification messages.
- Fix: [#18070] Underground entrance/exit shows through terrain walls (original bug).
- Fix: [#18094] Underground shops & facilities don't show when adjacent to non-underground path (original bug).
- Fix: [#18122] Ghosts count towards “Great scenery!” guest thought.
- Fix: [#18134] Underground on-ride photo section partially clips through adjacent terrain edge.
- Fix: [#18244] Invention DragWindow's starting position is inconsistent.
- Fix: [#18245] Guests stopping dead in their tracks at railway crossings.
- Fix: [#18257] Guests ‘waiting’ on extended railway crossings.
- Fix: [#18354] Overwrite alert does not show when save name has different casing on Windows.
- Fix: [#18379] Tunnel entrances for underground Mini Golf Hole E are not rendered correctly.
- Fix: [#18442] About window background is clickable.
- Fix: [#18449] [Plugin] Change type of listview widgets from 'scroll_view' to 'listview'.
- Fix: [#18453] Slow walking guests don't get across level crossings in time.
- Fix: [#18469] Land rights window buttons incorrectly disabled and markers remain visible indefinitely.
- Fix: [#18459] ‘Highlight path issues’ hides fences for paths with additions.
- Fix: [#18552] Trains clipping through helixes.
- Fix: [#18576] Cannot open parks with certain types of corrupt tile elements.
- Fix: [#18606] JSON objects do not take priority over the DAT files they supersede.
- Fix: [#18620] [Plugin] Crash when reading widget properties from windows that have both static and tab widgets.
- Fix: [#18653] Negative ratings multipliers do not appear in Vehicle tab.
- Fix: [#18696] Construction rights cannot be viewed after all are purchased.
- Fix: [#18720] Upwards helix is enabled for the Alpine Coaster, even when cheats are off.
- Fix: [#18755] Ferris Wheel and Circus ghosts not coloured correctly.
- Fix: [#18802] Game could crash when determining if a mechanic is heading to fix the ride blocking the path.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

squash merge A PR that should be squashed on merge. testing required PR needs to be tested before it is merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants