Match zMusicUnpause #391
Merged
Match zMusicUnpause #391
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
SquareMan
requested changes
Oct 11, 2024
src/SB/Game/zMusic.h
Outdated
| @@ -38,7 +38,7 @@ struct zMusicTrackInfo | |||
|
|
|||
| void volume_reset(); | |||
| void zMusicRefreshVolume(); | |||
| S32 getCurrLevelMusicEnum(); | |||
| static S32 getCurrLevelMusicEnum(); | |||
There was a problem hiding this comment.
This function declaration should be removed from the header since other cpp files won't be able to call this function
src/SB/Game/zMusic.cpp
Outdated
| @@ -114,7 +114,6 @@ void zMusicInit() | |||
| volume_reset(); | |||
| } | |||
|
|
|||
| // Correct, but won't work due to the switch case jump table (messes with offsets) | |||
| S32 getCurrLevelMusicEnum() | |||
There was a problem hiding this comment.
Looks like this should be static since you changed the prototype?
|
Integrated both of the changes |
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.
Thanks @tgsm
Also remove outdated comment and match getCurrLevelMusicEnum linkage
Tried to find more stuff to put in here but it's a tough file 💀