libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 07:53:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: fix resetAllSounds() in player_sid

Browse Source 
It actually was stopMusic() before and so stopped only the music and not all sounds.
The former implementation is for the o_stopMusic opcode which is not supported directly by ScummVM (it always stops all sounds). It is kept as stopMusic_intern() but is not used anymore.
This commit is contained in:
Tobias Gunkel 2012-01-22 01:43:46 +01:00
parent 00dcc63e8f
commit 7d4ffb1ec0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/scumm/player_sid.cpp
View File

@ -683,7 +683,7 @@ void Player_SID::stopSound_intern(int soundResID) { // $5093
releaseResource(soundResID);
}
void Player_SID::stopAllSounds_intern() { // $4CAA
void Player_SID::stopMusic_intern() { // $4CAA
statusBits1B = 0;
isMusicPlaying = false;
@ -1352,7 +1352,7 @@ void Player_SID::stopSound(int nr) {
void Player_SID::stopAllSounds() {
Common::StackLock lock(_mutex);
stopAllSounds_intern();
resetPlayerState();
}
int Player_SID::getSoundStatus(int nr) const {

3
engines/scumm/player_sid.h
View File

@ -57,7 +57,6 @@ public:
virtual ~Player_SID();
virtual void setMusicVolume(int vol) { _maxvol = vol; }
void startMusic(int songResIndex);
virtual void startSound(int sound);
virtual void stopSound(int sound);
virtual void stopAllSounds();
@ -95,7 +94,7 @@ private:
void initMusic(int songResIndex); // $7de6
int initSound(int soundResID); // $4D0A
void stopSound_intern(int soundResID); // $5093
void stopAllSounds_intern(); // $4CAA
void stopMusic_intern(); // $4CAA
void resetSID(); // $48D8
void update(); // $481B