aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/player_sid.h
diff options
context:
space:
mode:
authorTobias Gunkel2012-01-22 01:43:46 +0100
committerTobias Gunkel2012-02-11 08:29:10 +0100
commit7d4ffb1ec068bb149fb20287d955719d3c3f5a0d (patch)
tree64db500cf96e34f4ed11fd8ce452ed97eea64bfe /engines/scumm/player_sid.h
parent00dcc63e8f7c59c5e331963e56b03a5f8462745d (diff)
downloadscummvm-rg350-7d4ffb1ec068bb149fb20287d955719d3c3f5a0d.tar.gz
scummvm-rg350-7d4ffb1ec068bb149fb20287d955719d3c3f5a0d.tar.bz2
scummvm-rg350-7d4ffb1ec068bb149fb20287d955719d3c3f5a0d.zip
SCUMM: fix resetAllSounds() in player_sid
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.
Diffstat (limited to 'engines/scumm/player_sid.h')
-rw-r--r--engines/scumm/player_sid.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/scumm/player_sid.h b/engines/scumm/player_sid.h
index baeb7bbef0..12e3573575 100644
--- a/engines/scumm/player_sid.h
+++ b/engines/scumm/player_sid.h
@@ -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