diff options
| author | md5 | 2011-04-27 13:12:05 +0300 |
|---|---|---|
| committer | md5 | 2011-04-27 13:13:35 +0300 |
| commit | d28344bb55b836d477e02ad670fba3193dc17490 (patch) | |
| tree | 56eb133d32e780d787cbadf1049fead16d96d2e8 | |
| parent | bc0e373da88155e6fe694ff727ca430a40081c88 (diff) | |
| download | scummvm-rg350-d28344bb55b836d477e02ad670fba3193dc17490.tar.gz scummvm-rg350-d28344bb55b836d477e02ad670fba3193dc17490.tar.bz2 scummvm-rg350-d28344bb55b836d477e02ad670fba3193dc17490.zip | |
SCI: Removed unused variables
Thanks to LordHoto and the trusty -Wunused-but-set-variable option :)
| -rw-r--r-- | engines/sci/resource.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/sound/drivers/midi.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 4caa77b0ae..2a7c646672 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -1275,7 +1275,7 @@ ResVersion ResourceManager::detectVolVersion() { // SCI32 volume format: {bResType wResNumber dwPacked dwUnpacked wCompression} = 13 bytes // Try to parse volume with SCI0 scheme to see if it make sense // Checking 1MB of data should be enough to determine the version - uint16 resId, wCompression; + uint16 wCompression; uint32 dwPacked, dwUnpacked; ResVersion curVersion = kResVersionSci0Sci1Early; bool failed = false; @@ -1285,7 +1285,7 @@ ResVersion ResourceManager::detectVolVersion() { while (!fileStream->eos() && fileStream->pos() < 0x100000) { if (curVersion > kResVersionSci0Sci1Early) fileStream->readByte(); - resId = fileStream->readUint16LE(); + fileStream->skip(2); // resId dwPacked = (curVersion < kResVersionSci2) ? fileStream->readUint16LE() : fileStream->readUint32LE(); dwUnpacked = (curVersion < kResVersionSci2) ? fileStream->readUint16LE() : fileStream->readUint32LE(); diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp index 9eef867aeb..f36aac3a2a 100644 --- a/engines/sci/sound/drivers/midi.cpp +++ b/engines/sci/sound/drivers/midi.cpp @@ -745,7 +745,7 @@ uint8 MidiPlayer_Midi::getGmInstrument(const Mt32ToGmMap &Mt32Ins) { void MidiPlayer_Midi::mapMt32ToGm(byte *data, size_t size) { // FIXME: Clean this up int memtimbres, patches; - uint8 group, number, keyshift, finetune, bender_range; + uint8 group, number, keyshift, /*finetune,*/ bender_range; uint8 *patchpointer; uint32 pos; int i; @@ -784,7 +784,7 @@ void MidiPlayer_Midi::mapMt32ToGm(byte *data, size_t size) { group = *patchpointer; number = *(patchpointer + 1); keyshift = *(patchpointer + 2); - finetune = *(patchpointer + 3); + //finetune = *(patchpointer + 3); bender_range = *(patchpointer + 4); debugCN(kDebugLevelSound, " [%03d] ", i); |