Upstream merge fixes #1
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update objects to v1.7.4
In headless mode the game would see `TitleScene::_sequencePlayer` is null and try setting it to an instance of `GetContext().GetUiContext().GetTitleSequencePlayer();`, but in headless mode we return a nullptr anyway from `DummyUiContext` and there are no further checks for nullptr.
Small audio cleanup
Co-authored-by: Gymnasiast <Gymnasiast@users.noreply.github.com>
* ReplayManager.h: Include <cstdint> (GCC16 fix) Closes: OpenRCT2#25522 * Crypt.h: Include <cstdint> (GCC16 fix) * Zip.h: Include <cstdint> (GCC16 fix) * NetworkKey.h: Include <cstdint> (GCC16 fix) * AudioMixer.h: Include <cstdint> (GCC16 fix) * NetworkServerAdvertiser.h: Include <cstdint> (GCC16 fix)
- Feature: [OpenRCT2#25459] Wall line dragging tool. - Improved: [OpenRCT2#25028] Stalls now support colour presets, just like regular rides. - Improved: [OpenRCT2#25426] Building the track designs index is now quicker. - Improved: [OpenRCT2#25490] The ‘New Ride’ window can now be resized. - Fix: [OpenRCT2#6228] The saved queue line path connections are not preserved when placing track designs (original bug). - Fix: [OpenRCT2#14365] Track designs with scenery below the lowest track piece do not preview correctly. - Fix: [OpenRCT2#25451] Dropdown item tooltips stay open if the mouse is moved over an empty space. - Fix: [OpenRCT2#25454] Opening the land tool while building a path bridge or tunnel closes the Footpaths window. - Fix: [OpenRCT2#25461] Path connections in raised track designs are sometimes broken when placed. - Fix: [OpenRCT2#25467] Paths are not connected together correctly in track design previews. - Fix: [OpenRCT2#25476] When both RCT2 and RCT1 are present, autodetection fails. - Fix: [OpenRCT2#25480] The mini track design preview and price are misaligned in Enlarged UI mode. - Fix: [OpenRCT2#25488] Crash in headless mode. - Fix: [OpenRCT2#25494] The Go-Karts steep to flat track does not draw correctly in the flat side tunnel. - Fix: [OpenRCT2#25518] The virtual floor does not draw correctly if expanded on the positive x and y axes. - Fix: [OpenRCT2#25519] Crackling audio when sampling frequencies do not match. - Fix: [objects#401] Round tunnels on down slopes glitch. - Fix: [objects#404] Wooden Wild Mine cars incorrectly allow setting a third remap colour. - Fix: [objects#408] Australian fountain sets have confusing naming. - Fix: [objects#409] LIM Launched Coaster trains incorrectly have a 10% intensity modifier set (original bug). - Fix: [objects#410] Large scenery from the Wacky Worlds Africa theming have incorrect previews when using specific versions of the RCT2 base game. - Fix: [objects#415] Penguin bobsleigh trains show incorrect sprites on the 12° down slope (original bug).
…25771) * Remove redundant namespace qualifiers from tests project * Make namespace qualifier explicit
…25781) Co-authored-by: matheusvb3 <matheusvb3@users.noreply.github.com>
Name more Sub[0-9A-F]{6} functions
…elated-names-b Rename footpath related struct members
…fixes-v2 # Conflicts: # data/language/en-GB.txt # src/openrct2/actions/TrackDesignAction.cpp # src/openrct2/actions/TrackPlaceAction.cpp
Update AI agent code to work with current upstream API changes: - Status enum case changes (Ok -> ok, InvalidParameters -> invalidParameters, etc.) - Result struct field case changes (Position -> position, Expenditure -> expenditure) - Method name changes (GetData -> getData, GetErrorMessage -> getErrorMessage) - PaletteIndex now requires explicit static_cast from uint8_t - SequenceFlags uses .getEntranceConnectionSides() instead of bitwise operators - CommandFlag requires GameActions:: namespace prefix 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Update TrackElemType enum case (None→none, Maze→maze, etc.) - Update MechanicStatus to enum class - Update RideInspection to enum class - Add 6th parameter (RideInspection) to RideCreateAction constructor - Fix PaletteIndex type conversions in AIAgentTerminal - Update TrackPlaceAction.cpp to upstream version 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See last 2 commits for fixes to make this work after pulling in develop. If you prefer rebase over merge I can do that.