[Scummvm-cvs-logs] scummvm-tools master -> 5b35afdd4246e414b3cfa676e0dd45682419fe18

digitall dgturner at iee.org
Tue Nov 27 03:18:54 CET 2012


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

Summary:
5b35afdd42 TOOLS: Fix further unused-but-set compiler warnings.


Commit: 5b35afdd4246e414b3cfa676e0dd45682419fe18
    https://github.com/scummvm/scummvm-tools/commit/5b35afdd4246e414b3cfa676e0dd45682419fe18
Author: D G Turner (digitall at scummvm.org)
Date: 2012-11-26T18:17:53-08:00

Commit Message:
TOOLS: Fix further unused-but-set compiler warnings.

Changed paths:
    engines/gob/compress_gob.cpp
    engines/gob/degob_script_v1.cpp
    engines/scumm/compress_scumm_bun.cpp



diff --git a/engines/gob/compress_gob.cpp b/engines/gob/compress_gob.cpp
index 873fb4d..659f4a6 100644
--- a/engines/gob/compress_gob.cpp
+++ b/engines/gob/compress_gob.cpp
@@ -205,7 +205,6 @@ void CompressGob::writeEmptyHeader(Common::File &stk, uint16 chunkCount) {
 void CompressGob::writeBody(Common::Filename *inpath, Common::File &stk, Chunk *chunks) {
 	Chunk *curChunk = chunks;
 	Common::File src;
-	uint32 tmpSize;
 
 	while (curChunk) {
 		inpath->setFullName(curChunk->name);
@@ -229,7 +228,6 @@ void CompressGob::writeBody(Common::Filename *inpath, Common::File &stk, Chunk *
 		}
 
 		if (curChunk->packed == 0) {
-			tmpSize = 0;
 			curChunk->size = writeBodyStoreFile(stk, src);
 			print("Storing %12s\t%d bytes", curChunk->name, curChunk->size);
 		}
diff --git a/engines/gob/degob_script_v1.cpp b/engines/gob/degob_script_v1.cpp
index 196bc10..63154f4 100644
--- a/engines/gob/degob_script_v1.cpp
+++ b/engines/gob/degob_script_v1.cpp
@@ -705,7 +705,7 @@ void Script_v1::o1_drawOperations(FuncParams &params) {
 
 void Script_v1::o1_goblinFunc(FuncParams &params) {
 	FuncParams gobParams;
-	bool objDescSet = false;
+	//bool objDescSet = false;
 	int16 cmd;
 
 	gobParams.extraData = 0;
@@ -715,24 +715,24 @@ void Script_v1::o1_goblinFunc(FuncParams &params) {
 	skip(2);
 
 	if ((cmd > 0) && (cmd < 17)) {
-		objDescSet = true;
+		//objDescSet = true;
 		gobParams.objIndex = (int16) readUint16();
 		gobParams.extraData = (int16) readUint16();
 	}
 
 	if ((cmd > 90) && (cmd < 107)) {
-		objDescSet = true;
+		//objDescSet = true;
 		gobParams.objIndex = (int16) readUint16();
 		gobParams.extraData = (int16) readUint16();
 		cmd -= 90;
 	}
 
 	if ((cmd > 110) && (cmd < 128)) {
-		objDescSet = true;
+		//objDescSet = true;
 		gobParams.objIndex = (int16) readUint16();
 		cmd -= 90;
 	} else if ((cmd > 20) && (cmd < 38)) {
-		objDescSet = true;
+		//objDescSet = true;
 		gobParams.objIndex = (int16) readUint16();
 	}
 
diff --git a/engines/scumm/compress_scumm_bun.cpp b/engines/scumm/compress_scumm_bun.cpp
index d59fca8..e16e5f9 100644
--- a/engines/scumm/compress_scumm_bun.cpp
+++ b/engines/scumm/compress_scumm_bun.cpp
@@ -499,7 +499,7 @@ int32 CompressScummBun::decompressCodec(int32 codec, byte *comp_input, byte *com
 			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;
@@ -539,7 +539,7 @@ int32 CompressScummBun::decompressCodec(int32 codec, byte *comp_input, byte *com
 				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;






More information about the Scummvm-git-logs mailing list