diff options
| author | Filippos Karapetis | 2010-10-07 20:18:33 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-10-07 20:18:33 +0000 |
| commit | 7f6fa7e030882e8307dae153eae560d0cb8785ac (patch) | |
| tree | 83f2f8610a2246f0280b7521cb6f1e4be4e129d1 | |
| parent | cacfefa699363153ca27e8f226ca65539cc4cf10 (diff) | |
| download | scummvm-rg350-7f6fa7e030882e8307dae153eae560d0cb8785ac.tar.gz scummvm-rg350-7f6fa7e030882e8307dae153eae560d0cb8785ac.tar.bz2 scummvm-rg350-7f6fa7e030882e8307dae153eae560d0cb8785ac.zip | |
SCUMM: Silenced signed/unsigned warnings, removed unused variable
svn-id: r53055
| -rw-r--r-- | engines/scumm/player_towns.cpp | 5 | ||||
| -rw-r--r-- | engines/scumm/player_towns.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/scumm/player_towns.cpp b/engines/scumm/player_towns.cpp index 1c4ae51d2a..a2a00bf2a5 100644 --- a/engines/scumm/player_towns.cpp +++ b/engines/scumm/player_towns.cpp @@ -156,7 +156,7 @@ void Player_Towns::stopPcmTrack(int sound) { } } -int Player_Towns::getNextFreePcmChannel(int sound, int sfxChanRelIndex, int priority) { +int Player_Towns::getNextFreePcmChannel(int sound, int sfxChanRelIndex, uint32 priority) { if (!_intf) return 0; @@ -693,7 +693,6 @@ int32 Player_Towns_v2::doCommand(int numargs, int args[]) { _soundOverride2[args[1]].type = 7; } if (_soundOverride2[args[1]].type == 7) { - int p = CLIP<int>(args[2], -63, 63); _soundOverride2[args[1]].pan = 64 - CLIP<int>(args[2], -63, 63); res = 0; } @@ -733,7 +732,7 @@ void Player_Towns_v2::playPcmTrackSBL(const uint8 *data) { const uint8 *src = data + 6; uint8 *dst = _sblData + 32; - for (int i = 0; i < len; i++) + for (uint32 i = 0; i < len; i++) *dst++ = *src & 0x80 ? (*src++ & 0x7f) : -*src++; _intf->callback(37, 0x3f + chan, 60, 127, _sblData); diff --git a/engines/scumm/player_towns.h b/engines/scumm/player_towns.h index 3e0fc3598a..1ec7cc515e 100644 --- a/engines/scumm/player_towns.h +++ b/engines/scumm/player_towns.h @@ -59,7 +59,7 @@ protected: void playPcmTrack(int sound, const uint8 *data, int velo = 0, int pan = 64, int note = 0, int priority = 0); void stopPcmTrack(int sound); - int getNextFreePcmChannel(int sound, int sfxChanRelIndex, int priority); + int getNextFreePcmChannel(int sound, int sfxChanRelIndex, uint32 priority); struct PcmCurrentSound { uint16 index; |