libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 01:46:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SCUMM: (MI1/Amiga) - implement music restart after load

Browse Source
This commit is contained in:
athrxx 2024-04-14 23:19:29 +02:00
parent ac23a92e30
commit aedb74be6e
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/scumm/players/player_v4a.cpp
View File

@ -37,7 +37,8 @@ Player_V4A::Player_V4A(ScummEngine *scumm, Audio::Mixer *mixer)
_musicId(),
_sfxSlots(),
_initState(0),
_signal(0) {
_signal(0),
_lastSong(-1) {
assert(scumm);
assert(mixer);
@ -84,6 +85,7 @@ void Player_V4A::stopAllSounds() {
clearSfxSlots();
} else
_mixer->stopHandle(_musicHandle);
_lastSong = -1;
}
void Player_V4A::stopSound(int nr) {
@ -97,11 +99,13 @@ void Player_V4A::stopSound(int nr) {
else
_mixer->stopHandle(_musicHandle);
_signal = 0;
_lastSong = -1;
} else {
const int chan = getSfxChan(nr);
if (chan != -1) {
setSfxSlot(chan, 0);
_tfmxSfx.stopMacroEffect(chan);
_lastSong = -1;
}
}
}
@ -152,6 +156,7 @@ void Player_V4A::startSound(int nr) {
if (!_mixer->isSoundHandleActive(_sfxHandle))
_mixer->playStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, &_tfmxSfx, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
_lastSong = -1;
} else { // Song
debug(3, "player_v4a: play %d: song %i - %02X", nr, index, type);
if (ptr[6] != 0x7F)
@ -163,7 +168,7 @@ void Player_V4A::startSound(int nr) {
// the Tfmx-player never "ends" the output by itself, so this should be threadsafe
if (!_mixer->isSoundHandleActive(_musicHandle))
_mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, &_tfmxMusic, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
_musicId = nr;
_musicId = _lastSong = nr;
}
}
@ -186,4 +191,18 @@ int Player_V4A::getSoundStatus(int nr) const {
return (nr == _musicId) ? _signal : 0;
}
void Player_V4A::saveLoadWithSerializer(Common::Serializer &ser) {
if (ser.isLoading() && ser.getVersion() < VER(118))
_lastSong = -1;
else
ser.syncAsSint16BE(_lastSong, VER(118));
}
void Player_V4A::restoreAfterLoad() {
int snd = _lastSong;
stopAllSounds();
if (snd != -1)
startSound(snd);
}
} // End of namespace Scumm

3
engines/scumm/players/player_v4a.h
View File

@ -48,6 +48,8 @@ public:
void stopAllSounds() override;
int getMusicTimer() override;
int getSoundStatus(int sound) const override;
void saveLoadWithSerializer(Common::Serializer &ser) override;
void restoreAfterLoad() override;
private:
ScummEngine *const _vm;
@ -59,6 +61,7 @@ private:
Audio::SoundHandle _sfxHandle;
int _musicId;
int16 _lastSong;
uint16 _signal;
struct SfxChan {

2
engines/scumm/saveload.cpp
View File

@ -69,7 +69,7 @@ struct SaveInfoSection {
#define SaveInfoSectionSize (4+4+4 + 4+4 + 4+2)
#define CURRENT_VER 117
#define CURRENT_VER 118
#define INFOSECTION_VERSION 2
#pragma mark -