libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: Fix some more bugs with Loom replacement tracks

Browse Source 
Don't try to update the _musicTimer in saveLoadWithSerializer(), because
we haven't yet loaded all of the savegame. Instead, do that in a new
restoreAfterLoad() method.

As an extra bonus, if an audio track was playing when the game was
saved, try to resume it from approximately that point.

Unfortunately, it turns out that _currentCDSound was not properly reset
when the song ended so loading a savegame made with an earlier version
of this feature may cause it to play music that it shouldn't. But that's
the kind of thing you should count on on the bleeding edge. Savegames
made after this change should be fine.
This commit is contained in:
Torbjörn Andersson 2022-03-08 11:19:39 +01:00
parent 47e4c3c10c
commit b5a93d9d67
3 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/scumm/saveload.cpp
View File

@ -594,6 +594,8 @@ bool ScummEngine::loadState(int slot, bool compat, Common::String &filename) {
}
}
_sound->restoreAfterLoad();
return true;
}

50
engines/scumm/sound.cpp
View File

@ -133,7 +133,10 @@ void Sound::updateMusicTimer() {
// this information at the time of writing.
if (!pollCD() && !isLoomOverture) {
_currentCDSound = 0;
_musicTimer = 0;
_replacementTrackStartTime = 0;
_replacementTrackPauseTime = 0;
return;
}
@ -323,6 +326,7 @@ void Sound::playSound(int soundID) {
if (trackNr != -1) {
_currentCDSound = soundID;
_replacementTrackStartTime = g_system->getMillis();
_replacementTrackPauseTime = 0;
_musicTimer = 0;
g_system->getAudioCDManager()->play(trackNr, 1, 0, 0, true);
return;
@ -1025,6 +1029,7 @@ void Sound::stopSound(int sound) {
_currentCDSound = 0;
_musicTimer = 0;
_replacementTrackStartTime = 0;
_replacementTrackPauseTime = 0;
stopCD();
stopCDTimer();
}
@ -1051,6 +1056,9 @@ void Sound::stopSound(int sound) {
void Sound::stopAllSounds() {
if (_currentCDSound != 0) {
_currentCDSound = 0;
_musicTimer = 0;
_replacementTrackStartTime = 0;
_replacementTrackPauseTime = 0;
stopCD();
stopCDTimer();
}
@ -1385,15 +1393,43 @@ AudioCDManager::Status Sound::getCDStatus() {
void Sound::saveLoadWithSerializer(Common::Serializer &s) {
s.syncAsSint16LE(_currentCDSound, VER(35));
s.syncAsSint16LE(_currentMusic, VER(35));
if (s.isLoading() && _vm->VAR_MUSIC_TIMER != 0xFF) {
uint32 now = g_system->getMillis();
_musicTimer = _vm->VAR(_vm->VAR_MUSIC_TIMER);
_replacementTrackStartTime = now - 100 * TIMER_TO_TICKS(_musicTimer);
_replacementTrackPauseTime = now;
}
}
void Sound::restoreAfterLoad() {
_musicTimer = 0;
_replacementTrackStartTime = 0;
_replacementTrackPauseTime = 0;
if (_useReplacementAudioTracks && _currentCDSound) {
int trackNr = getReplacementAudioTrack(_currentCDSound);
if (trackNr != -1) {
uint32 now = g_system->getMillis();
uint32 frame;
_musicTimer = _vm->VAR(_vm->VAR_MUSIC_TIMER);
_replacementTrackPauseTime = 0;
// We try to resume the audio track from where it was
// saved. The timer isn't very accurate, but it should
// be good enough.
if (_musicTimer > 0) {
_replacementTrackStartTime = now - 100 * TIMER_TO_TICKS(_musicTimer);
frame = (75 * TIMER_TO_TICKS(_musicTimer)) / 10;
} else {
_replacementTrackStartTime = now;
frame = 0;
}
// If the user has fiddled with the Loom overture
// setting, the calculated position could be outside
// the track, but it seems a warning message is as bad
// as it gets.
g_system->getAudioCDManager()->play(trackNr, 1, frame, 0, true);
}
}
}
#pragma mark -
#pragma mark --- Sound resource handling ---

1
engines/scumm/sound.h
View File

@ -155,6 +155,7 @@ public:
int getMusicTimer() const { return _musicTimer; }
void saveLoadWithSerializer(Common::Serializer &ser) override;
void restoreAfterLoad();
protected:
void setupSfxFile();