From d83a83ef5021c1e329127d3c6402088aeb1c1dd1 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Tue, 29 Mar 2011 21:55:21 +0200
Subject: JANITORIAL: Remove/comment unused vars

Found by GCC 4.6's -Wunused-but-set-variable
---
 engines/scumm/imuse_digi/dimuse_codecs.cpp |  4 ++--
 engines/scumm/insane/insane_iact.cpp       | 20 ++++++++++----------
 engines/scumm/room.cpp                     |  3 +--
 engines/scumm/script_v6.cpp                |  4 ++--
 4 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/imuse_digi/dimuse_codecs.cpp b/engines/scumm/imuse_digi/dimuse_codecs.cpp
index 3f7c341701..62a006c56b 100644
--- a/engines/scumm/imuse_digi/dimuse_codecs.cpp
+++ b/engines/scumm/imuse_digi/dimuse_codecs.cpp
@@ -522,7 +522,7 @@ int32 decompressCodec(int32 codec, byte *compInput, byte *compOutput, int32 inpu
 			int32 destPos;
 			int16 firstWord;
 			byte initialTablePos[MAX_CHANNELS] = {0, 0};
-			int32 initialimcTableEntry[MAX_CHANNELS] = {7, 7};
+			//int32 initialimcTableEntry[MAX_CHANNELS] = {7, 7};
 			int32 initialOutputWord[MAX_CHANNELS] = {0, 0};
 			int32 totalBitOffset, curTablePos, outputWord;
 			byte *dst;
@@ -562,7 +562,7 @@ int32 decompressCodec(int32 codec, byte *compInput, byte *compOutput, int32 inpu
 				for (i = 0; i < channels; i++) {
 					initialTablePos[i] = *src;
 					src += 1;
-					initialimcTableEntry[i] = READ_BE_UINT32(src);
+					//initialimcTableEntry[i] = READ_BE_UINT32(src);
 					src += 4;
 					initialOutputWord[i] = READ_BE_UINT32(src);
 					src += 4;
diff --git a/engines/scumm/insane/insane_iact.cpp b/engines/scumm/insane/insane_iact.cpp
index 942256b1a4..265931ecc2 100644
--- a/engines/scumm/insane/insane_iact.cpp
+++ b/engines/scumm/insane/insane_iact.cpp
@@ -62,7 +62,7 @@ void Insane::procIACT(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 					  int32 setupsan13, Common::SeekableReadStream &b, int32 size, int32 flags,
 					  int16 par1, int16 par2, int16 par3, int16 par4) {
-	int16 par5, par6, par7, par9, par11, par13, tmp;
+	int16 par5, par6, par7, par9, par11, par13;
 
 	switch (par1) {
 	case 2: // PATCH
@@ -99,15 +99,15 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 		if (par2 != 13)
 			break;
 
-		tmp = b.readUint16LE();   // +8
-		tmp = b.readUint16LE();   // +10
-		par7 = b.readUint16LE();  // +12 dx
-		tmp = b.readUint16LE();   // +14
-		par9 = b.readUint16LE();  // +16 bx
-		tmp = b.readUint16LE();   // +18
-		par11 = b.readUint16LE(); // +20 cx
-		tmp = b.readUint16LE();   // +22
-		par13 = b.readUint16LE(); // +24 ax
+		b.readUint16LE();			// +8
+		b.readUint16LE();			// +10
+		par7 = b.readUint16LE();	// +12 dx
+		b.readUint16LE();			// +14
+		par9 = b.readUint16LE();	// +16 bx
+		b.readUint16LE();			// +18
+		par11 = b.readUint16LE();	// +20 cx
+		b.readUint16LE();			// +22
+		par13 = b.readUint16LE();	// +24 ax
 
 		if (par13 > _actor[0].x || par11 < _actor[0].x) {
 			_tiresRustle = true;
diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index 02b2482e40..58b6cdb105 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -581,7 +581,7 @@ void ScummEngine::resetRoomSubBlocks() {
 
 void ScummEngine_v3old::setupRoomSubBlocks() {
 	const byte *ptr;
-	byte *roomptr, *searchptr = 0;
+	byte *roomptr;
 	const RoomHeader *rmhd;
 
 	_ENCD_offs = 0;
@@ -669,7 +669,6 @@ void ScummEngine_v3old::setupRoomSubBlocks() {
 
 	// Determine the room script base address
 	roomptr = getResourceAddress(rtRoom, _roomResource);
-	searchptr = roomptr;
 
 	memset(_localScriptOffsets, 0, sizeof(_localScriptOffsets));
 
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 30187937f3..abe397ba7e 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -1228,11 +1228,11 @@ void ScummEngine_v6::o6_animateActor() {
 }
 
 void ScummEngine_v6::o6_doSentence() {
-	int verb, objectA, objectB, dummy = 0;
+	int verb, objectA, objectB;
 
 	objectB = pop();
 	if (_game.version < 8)
-		dummy = pop();	// dummy pop (in Sam&Max, seems to be always 0 or 130)
+		pop();	// dummy pop (in Sam&Max, seems to be always 0 or 130)
 	objectA = pop();
 	verb = pop();
 
-- 
cgit v1.2.3