[pull] develop from OpenRCT2:develop #34
Merged
Conversation
This file contains 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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
pull
bot
added
⤵️ pull
and removed
🔍 Ready for Review
|
Pull request analysis by VIZIPI Below you will find who is the most qualified team member to review your code. Reviewers with knowledge related to these changes
Potential missing files from this Pull requestfiles commonly committed with a subset of this pr, but not committed this time. (click to collapse)
Committed file ranks(click to expand)73.38%[src/openrct2-ui/input/MouseInput.cpp] 65.17%[src/openrct2/rct12/RCT12.h] 65.17%[src/openrct2/world/TileElement.h] 94.44%[src/openrct2-ui/windows/Cheats.cpp] 56.82%[src/openrct2/object/ObjectFactory.cpp] 45.30%[src/openrct2/rct12/RCT12.cpp] 98.01%[src/openrct2/network/NetworkBase.cpp] 0.00%[src/openrct2/world/Banner.cpp] 56.82%[src/openrct2-ui/scripting/CustomListView.cpp] 78.68%[data/language/en-GB.txt] |
Hard-Coded Secrets (3)Line 45 in 235afc4 Line 48 in 235afc4 Line 19 in 235afc4 More info on how to fix Hard-Coded Secrets in General. Insecure Use of Dangerous Function (1)More info on how to fix Insecure Use of Dangerous Function in C. 👉 Go to the dashboard for detailed results. 📥 Happy? Share your feedback with us. |
…onstruction Fix #13019: Prevent ghost trains from opening the construction window when crashing
Manuel vo desync fixes
Incorrect argument was used when drawing the minimum excitement rating in the Objective Selection window.
…13322) Issue was actually caused by loading RCT1 saves from certain rotations, and fixed by reseting sprite quadrants when loading. Wasn't an issue with RCT2 saves as litter screen coordinates are set directly from the save, rather than calculated based on rotation and sprite width/height.
This only happens when a new ride type is added and the park is opened in the older version of the game where the ride type does not exist. Reworked so that invalid rides are not loadable. Force reload of title if current scenario is corrupted.
As not all objects load images in the same order the previous code could end up with sprite index's that were incorrect. There also was no reason to make the code object specific as we can just access the image table directly.
* Moving all definitions from B...Actions to source * Moving all definitions from C...Actions to source * Moving all definitions from F...Actions to source * Moving all definitions from G...Actions to source * Moving all definitions from L...Actions to source * Moving all definitions from M...Actions to source * Moving all definitions from N...Actions to source * Moving all definitions from P...Actions to source
* Merge all cmdsprite global state into single struct * Move MakeEntries into a member function * Use std::optional for sprite file open * Move sprite_file_save to a member function * Make sprite_file_close a member function and rename open * Remove global variable * Make Entries a vector * Make Data a vector * Use FileStream for Open * Use FileStream for Save * Renmae Image Import/Export functions and cleanup * Extract out common item AddImage * Simplify SpriteFile::AddImage * Header and struct cleanup * Make suggested changes
* Fix incorrect formatting of input and output of g2.dat * Fix entry offsets and empty data
…anly (#13592) * Fix #13567: Cure guests of severe gluttony Incorrect assumption that bitscanforward itertated over 64 bits meant that food that was previously within the ExtraItemFlags would never get removed from the peeps inventory. bitscanforward function has been replaced with a 64bit version * Bump network version
Includes: * Corkscrew Roller Coaster * Hypercoaster * Steel Wild Mouse * Spinning Wild Mouse * Water Coaster * Car Ride * Monster Trucks Some pieces are incorrectly labelled (log bumps and rotation control toggle), and need to be investigated further
Restore extra cheat track pieces for some rides; intended to fix #13324
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 Commits and Changes for more details.
Created by
pull[bot]. Want to support this open source service? Please star it : )