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

SCUMM: Improvements to sound override #4028

Open
wants to merge 11 commits into
base: master
Choose a base branch
from

Conversation

YYxsCnnPP
Copy link
Contributor

@YYxsCnnPP YYxsCnnPP commented Jun 20, 2022

This is a follow-up of PR #2569.

  • HE v70 games now work with sound override
  • The duration of the replaced file is now respected
  • Added support for replacing speech (useful for translations)

Files can now be located in a separate directory "speech" or "sound". The search order is:

sound/####.flac
sound####.flac
sound/####.wav
sound####.wav
sound/####.ogg
sound####.ogg
sound/####.mp3
sound####.mp3

The speech files follow the same structure but use the offset from HE2 as ID because that is the only viable way to locate a specific audio clip.

@Thunderforge
Copy link
Contributor

@Thunderforge Thunderforge commented Jun 20, 2022

Without this code, the Putt-Putt Goes to the Moon remastered soundtrack fails to play at all and only the old music plays.

With this code, the remastered music now plays (although as we determined in Discord, the soundtracks are mislabeled so the wrong music plays, but that's a soundtrack issue, not a code issue).

@YYxsCnnPP YYxsCnnPP marked this pull request as draft Jun 20, 2022
@YYxsCnnPP
Copy link
Contributor Author

@YYxsCnnPP YYxsCnnPP commented Jun 22, 2022

Fixed some issues and implemented partially the Ticket #13602. The feature is now behind the option "Enable game-specific enhancements". The option to toggle the feature on or off while the game is running is not implemented.

@YYxsCnnPP YYxsCnnPP marked this pull request as ready for review Jun 22, 2022
engines/scumm/he/sound_he.cpp Outdated Show resolved Hide resolved
@Thunderforge
Copy link
Contributor

@Thunderforge Thunderforge commented Jun 26, 2022

Confirmed it still works with Putt-Putt Goes to the Moon and Putt-Putt Saves the Zoo. It is also properly affected by the

The feature is now behind the option "Enable game-specific enhancements"

This is a bit confusing. The tooltip description says "Allow ScummVM to make small enhancements to the game, usually based on other versions of the same game." Which I don't think really describes the soundtrack enhancements.

Is it possible to change the option to say something specific to sound and music? Also, would it make sense to move such a setting to the Audio tab?

@YYxsCnnPP
Copy link
Contributor Author

@YYxsCnnPP YYxsCnnPP commented Jun 26, 2022

I've moved the feature to "Use external audio". It can be set in the Game Options and in the pause menu. I'm not sure if this is the correct way to implement it. Feedback is welcome.

Also, would it make sense to move such a setting to the Audio tab?

If I understood the code correctly I can't add an engine-specific option in the Audio tab. I have to keep it in the Game tab.

engines/scumm/he/sound_he.cpp Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants