[Scummvm-cvs-logs] scummvm-tools master -> c5cdaa0c28209c8c12993e50033a4ed5b334fe98

[digitall]

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:
c5cdaa0c28 TOOLS: Fix further compiler warnings.


Commit: c5cdaa0c28209c8c12993e50033a4ed5b334fe98
    https://github.com/scummvm/scummvm-tools/commit/c5cdaa0c28209c8c12993e50033a4ed5b334fe98
Author: D G Turner (digitall at scummvm.org)
Date: 2012-11-26T18:44:04-08:00

Commit Message:
TOOLS: Fix further compiler warnings.

Changed paths:
    engines/gob/degob_script.cpp
    engines/sci/compress_sci.cpp
    engines/scumm/extract_loom_tg16.cpp



diff --git a/engines/gob/degob_script.cpp b/engines/gob/degob_script.cpp
index f7492fb..a9fb1cd 100644
--- a/engines/gob/degob_script.cpp
+++ b/engines/gob/degob_script.cpp
@@ -182,7 +182,7 @@ byte *ExtTable::unpack(const byte *packedData, uint32 &size) const {
 Script::Script(byte *totData, uint32 totSize, ExtTable *extTable) :
 	_totData(totData), _ptr(totData), _totSize(totSize), _extTable(extTable) {
 
-	assert((totData > 0) && (totSize > 128));
+	assert(totData && (totSize > 128));
 
 	_indent = 0;
 
diff --git a/engines/sci/compress_sci.cpp b/engines/sci/compress_sci.cpp
index e6d695e..51374f5 100644
--- a/engines/sci/compress_sci.cpp
+++ b/engines/sci/compress_sci.cpp
@@ -268,11 +268,11 @@ void CompressSci::compressData(SciResourceDataType dataType) {
 		sampleData = new byte[sampleDataSize];
 		_input.read_throwsOnError(sampleData, sampleDataSize);
 
-		bool dataUnsigned = false;
+		//bool dataUnsigned = false;
 		if (sampleFlags & 0x04)
 			sampleBits = 16;
-		if (sampleFlags & 0x08)
-			dataUnsigned = true;
+		//if (sampleFlags & 0x08)
+		//	dataUnsigned = true;
 		if (sampleFlags & 0x01) {
 			// SOL datastream is compressed, we need to uncompress it
 			byte *uncompressedData = new byte[sampleDataSize * 2];
diff --git a/engines/scumm/extract_loom_tg16.cpp b/engines/scumm/extract_loom_tg16.cpp
index 286eefe..7d2d3c1 100644
--- a/engines/scumm/extract_loom_tg16.cpp
+++ b/engines/scumm/extract_loom_tg16.cpp
@@ -759,10 +759,10 @@ void ExtractLoomTG16::extract_resource(Common::File &input, Common::File &output
 			write_cword(output, 'OR', &rlen); // RO - Room
 
 			uint16 slen;
-			uint8 stype;
+			//uint8 stype;
 
 			slen = read_cword(input, &i) - 3;
-			stype = read_cbyte(input, &i);
+			/*stype =*/ read_cbyte(input, &i);
 
 			write_clong(output, slen + 6, &rlen);
 			write_cword(output, 'AP', &rlen); // PA - palettes
@@ -775,7 +775,7 @@ void ExtractLoomTG16::extract_resource(Common::File &input, Common::File &output
 				write_cbyte(output, read_cbyte(input, &i), &rlen);
 
 			slen = read_cword(input, &i) - 3;
-			stype = read_cbyte(input, &i);
+			/*stype =*/ read_cbyte(input, &i);
 
 			write_clong(output, slen + 6, &rlen);
 			write_cword(output, 'LT', &rlen); // TL - tiles