diff options
| author | Jonathan Gray | 2003-12-16 09:43:08 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-12-16 09:43:08 +0000 |
| commit | 83e9c59327d695b4bf2e0d8ae6661b25042ff750 (patch) | |
| tree | 321f416f99654f03f69a4185996dbb29b9e8ac84 /sword1/sound.cpp | |
| parent | 9673833d97135fd9b5af5f3457f11babcba59d72 (diff) | |
| download | scummvm-rg350-83e9c59327d695b4bf2e0d8ae6661b25042ff750.tar.gz scummvm-rg350-83e9c59327d695b4bf2e0d8ae6661b25042ff750.tar.bz2 scummvm-rg350-83e9c59327d695b4bf2e0d8ae6661b25042ff750.zip | |
compilation fixes
svn-id: r11679
Diffstat (limited to 'sword1/sound.cpp')
| -rw-r--r-- | sword1/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sword1/sound.cpp b/sword1/sound.cpp index 4b64fabbf7..09e2d1d81a 100644 --- a/sword1/sound.cpp +++ b/sword1/sound.cpp @@ -40,7 +40,7 @@ SwordSound::SwordSound(const char *searchPath, SoundMixer *mixer, ResMan *pResMa int SwordSound::addToQueue(int32 fxNo) { bool alreadyInQueue = false; for (uint8 cnt = 0; (cnt < _endOfQueue) && (!alreadyInQueue); cnt++) - if (_fxQueue[cnt].id == fxNo) + if (_fxQueue[cnt].id == (uint32)fxNo) alreadyInQueue = true; if (!alreadyInQueue) { if (_endOfQueue == MAX_FXQ_LENGTH) @@ -117,7 +117,7 @@ void SwordSound::playSample(QueueElement elem) { uint8 *sampleData = (uint8*)_resMan->fetchRes(_fxList[elem.id].sampleId); for (uint16 cnt = 0; cnt < MAX_ROOMS_PER_FX; cnt++) { if (_fxList[elem.id].roomVolList[cnt].roomNo) { - if ((_fxList[elem.id].roomVolList[cnt].roomNo == SwordLogic::_scriptVars[SCREEN]) || + if ((_fxList[elem.id].roomVolList[cnt].roomNo == (int)SwordLogic::_scriptVars[SCREEN]) || (_fxList[elem.id].roomVolList[cnt].roomNo == -1)) { uint8 volL = _fxList[elem.id].roomVolList[cnt].leftVol * 10; |