diff options
| author | Paweł Kołodziejski | 2002-09-30 22:59:42 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-09-30 22:59:42 +0000 |
| commit | ce182dbaf3c3549b678cf6acb69c9e7d826033c4 (patch) | |
| tree | 7061b5bc368b6438229b8123e3e9e9fe8a07facb | |
| parent | 347b80100fc6b11206fabc09324c089ae6562076 (diff) | |
| download | scummvm-rg350-ce182dbaf3c3549b678cf6acb69c9e7d826033c4.tar.gz scummvm-rg350-ce182dbaf3c3549b678cf6acb69c9e7d826033c4.tar.bz2 scummvm-rg350-ce182dbaf3c3549b678cf6acb69c9e7d826033c4.zip | |
changed from byte to int16 to handle sound number greater than 255
svn-id: r5056
| -rw-r--r-- | scumm/sound.cpp | 4 | ||||
| -rw-r--r-- | scumm/sound.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index cad6bcfa89..13ca9a043a 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -68,7 +68,7 @@ void Sound::addSoundToQueue2(int sound) { } void Sound::processSoundQues() { - byte d; + int d; int i, j; int num; int16 data[16]; @@ -597,7 +597,7 @@ void Sound::stopSound(int a) { } for (i = 0; i < 10; i++) - if (_soundQue2[i] == (byte)a) + if (_soundQue2[i] == a) _soundQue2[i] = 0; } diff --git a/scumm/sound.h b/scumm/sound.h index a0c6af1725..6c206dc3fb 100644 --- a/scumm/sound.h +++ b/scumm/sound.h @@ -39,7 +39,7 @@ enum { }; int16 _soundQuePos, _soundQue[0x100]; - byte _soundQue2Pos, _soundQue2[10]; + int16 _soundQue2Pos, _soundQue2[10]; bool _soundsPaused2; bool _soundVolumePreset; |