Fix skybox being manipulated outside of appropriate scenes#5925
Merged
garrettjoecox merged 1 commit intoHarbourMasters:develop-copperfrom Nov 8, 2025
Merged
Conversation
1a99e95 to
64175d9
Compare
briaguya0
reviewed
Nov 5, 2025
Contributor
|
Would like this pointed at develop-copper, please. |
…aks to disable 2d backgrounds impl
64175d9 to
c3342bb
Compare
Contributor
Author
done |
briaguya0
approved these changes
Nov 5, 2025
Contributor
There was a problem hiding this comment.
haven't tested it but code looks good.
other than the couple c-style casts that'd be good to move to static casts (these were updated while i was writing this) everything i'd want to see changed (magic number for gWeatherMode, lack of information around what the HREG conditional means) isn't new to this PR and shouldn't block it
Member
|
🥖 for me, but thanks for fixing my mess, I thought it wasn't going to affect oher scenes anymore, looks like I was wrong o7 |
Malkierian
approved these changes
Nov 8, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
& other tweaks to disable 2d backgrounds impl
The main culprit was the usage of
VB_DRAW_2D_BACKGROUNDinz_scene_otr.cppwhich always setskyboxDisabled = false. We're instead now relying on the already existingAfterSceneCommandshook which only disables the skybox when in appropriate scenes.From what I could tell this doesn't break any of the scenes with Djipi's pack, but would appreciate a second look.
Fixes #5923
Build Artifacts