[Scummvm-cvs-logs] scummvm master -> c06dd901420fa9aebfb14a26b47e241910a7778b

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d28344bb55 SCI: Removed unused variables
c06dd90142 SAGA: Removed unused variables


Commit: d28344bb55b836d477e02ad670fba3193dc17490
    https://github.com/scummvm/scummvm/commit/d28344bb55b836d477e02ad670fba3193dc17490
Author: md5 (md5 at scummvm.org)
Date: 2011-04-27T03:13:35-07:00

Commit Message:
SCI: Removed unused variables

Thanks to LordHoto and the trusty -Wunused-but-set-variable option :)

Changed paths:
    engines/sci/resource.cpp
    engines/sci/sound/drivers/midi.cpp



diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 4caa77b..2a7c646 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 9eef867..f36aac3 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);


Commit: c06dd901420fa9aebfb14a26b47e241910a7778b
    https://github.com/scummvm/scummvm/commit/c06dd901420fa9aebfb14a26b47e241910a7778b
Author: md5 (md5 at scummvm.org)
Date: 2011-04-27T03:13:36-07:00

Commit Message:
SAGA: Removed unused variables

Thanks to LordHoto and the trusty -Wunused-but-set-variable option :)

Changed paths:
    engines/saga/interface.cpp



diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 0f84b09..c3773b2 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -2798,7 +2798,7 @@ void Interface::keyBoss() {
 	Rect rect;
 	ByteArray image;
 	int imageWidth, imageHeight;
-	const byte *pal;
+	//const byte *pal;
 	PalEntry cPal[PAL_ENTRIES];
 
 	_vm->_gfx->showCursor(false);
@@ -2818,7 +2818,7 @@ void Interface::keyBoss() {
 	rect.setHeight(imageHeight);
 
 	_vm->_gfx->getCurrentPal(_mapSavedPal);
-	pal = _vm->getImagePal(resourceData);
+	//pal = _vm->getImagePal(resourceData);
 
 	cPal[0].red = 0;
 	cPal[0].green = 0;