[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.1,1.2 graphics.cpp,1.3,1.4

[Max Horn]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv17231

Modified Files:
	cutaway.cpp graphics.cpp 
Log Message:
fix warnings

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cutaway.cpp	1 Oct 2003 17:57:09 -0000	1.1
+++ cutaway.cpp	1 Oct 2003 21:23:41 -0000	1.2
@@ -110,7 +110,7 @@
 		 Pointers to other places in the cutaway data
 	 */
 
-	byte *gameStatesPtr = _fileData + READ_BE_UINT16(ptr);
+	/*byte *gameStatesPtr =*/ _fileData + READ_BE_UINT16(ptr);
 	ptr += 2;
 
 	_nextSentence        = _fileData + READ_BE_UINT16(ptr);

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- graphics.cpp	1 Oct 2003 20:23:29 -0000	1.3
+++ graphics.cpp	1 Oct 2003 21:23:41 -0000	1.4
@@ -267,7 +267,7 @@
 	uint8 *src;
 
 	BobFrame *pbf = &_frames[bobnum];
-	if(scale >= 0 && scale < 100) {
+	if (scale < 100) {  // Note: scale is unsigned, hence always >= 0
 		bobShrink(pbf, scale);
 		src = _shrinkBuffer.data;
 		w   = _shrinkBuffer.width;
@@ -339,7 +339,7 @@
 		}
 	}
 	else {
-		BobFrame *pbf = &_frames[bobnum];
+//		BobFrame *pbf = &_frames[bobnum];
 //		_display->blit(panel, x, y, 320, pbf->data, pbf->width, pbf->height, false, false);
 	}
 }
@@ -347,7 +347,7 @@
 
 void QueenGraphics::bobPaste(uint32 bobnum, uint16 x, uint16 y) {
 
-	BobFrame *pbf = &_frames[bobnum];
+//	BobFrame *pbf = &_frames[bobnum];
 //	_display->blit(backdrop, x, y, 640, pbf->data, pbf->width, pbf->height, pbf->width, false, true);
 	frameErase(bobnum);
 }