Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix music changes between areas #874

Merged
merged 1 commit into from
Apr 10, 2022
Merged

Conversation

N00byKing
Copy link
Contributor

Changes:

Missed a Bug in #869.
When changing Areas, this line checks if Music is halted before playing the next track. However, it was never being halted, just paused.

Changing haltdasmusik to actually halt MusicTrack fixes it, but given the comment placed I wonder if this is the right approach. Could also check if Music is paused at the original location.

Legal Stuff:

By submitting this pull request, I confirm that...

  • My changes may be used in a future commercial release of VVVVVV
  • I will be credited in a CONTRIBUTORS file and the "GitHub Friends"
    section of the credits for all of said releases, but will NOT be compensated
    for these changes

@InfoTeddy
Copy link
Contributor

Yeah, so the comment is there because we rely on the music to simply pause so custom levels can resume it later with resumemusic and musicfadein.

It looks like halting here will destroy the music, so halting here won't work. Instead it's probably better to change halted to return being paused.

@N00byKing
Copy link
Contributor Author

So turns out there isn't a way to check if a voice is playing or not. Added a var to check if its paused

Copy link
Contributor

@InfoTeddy InfoTeddy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and it seems to work fine. Music area changes now work again and resumemusic/musicfadein work as intended.

@InfoTeddy InfoTeddy merged commit e16c155 into TerryCavanagh:master Apr 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants