[Scummvm-cvs-logs] scummvm master -> 8609e22e404c06c20c6726ee38425fa4436b6c11

[bluegr]

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

Summary:
8609e22e40 SCI: Silenced warnings


Commit: 8609e22e404c06c20c6726ee38425fa4436b6c11
    https://github.com/scummvm/scummvm/commit/8609e22e404c06c20c6726ee38425fa4436b6c11
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-10-14T10:30:22-07:00

Commit Message:
SCI: Silenced warnings

Changed paths:
    engines/sci/engine/kgraphics.cpp
    engines/sci/graphics/text32.cpp



diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 0d5b586..fd8e9ee 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -1654,11 +1654,11 @@ reg_t kBitmap(EngineState *s, int argc, reg_t *argv) {
 		// script 64890 and TransView::init() in script 64884
 		uint16 width = argv[1].toUint16();
 		uint16 height = argv[2].toUint16();
-		uint16 skip = argv[3].toUint16();
+		//uint16 skip = argv[3].toUint16();
 		uint16 back = argv[4].toUint16();	// usually equals skip
-		uint16 width2 = (argc >= 6) ? argv[5].toUint16() : 0;
-		uint16 height2 = (argc >= 7) ? argv[6].toUint16() : 0;
-		uint16 transparentFlag = (argc >= 8) ? argv[7].toUint16() : 0;
+		//uint16 width2 = (argc >= 6) ? argv[5].toUint16() : 0;
+		//uint16 height2 = (argc >= 7) ? argv[6].toUint16() : 0;
+		//uint16 transparentFlag = (argc >= 8) ? argv[7].toUint16() : 0;
 
 		// TODO: skip, width2, height2, transparentFlag
 		// (used for transparent bitmaps)
diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp
index 0d4f8de..606a935 100644
--- a/engines/sci/graphics/text32.cpp
+++ b/engines/sci/graphics/text32.cpp
@@ -133,11 +133,11 @@ void GfxText32::drawTextBitmap(reg_t textObject) {
 		textY = textY * _screen->getDisplayHeight() / _screen->getHeight();
 	}
 
-	for (int y = 0; y < height; y++) {
-		for (int x = 0; x < width; x++) {
+	for (int curY = 0; curY < height; curY++) {
+		for (int curX = 0; curX < width; curX++) {
 			byte pixel = surface[curByte++];
 			if (pixel)
-				_screen->putFontPixel(textY, x + textX, y, pixel);
+				_screen->putFontPixel(textY, curX + textX, curY, pixel);
 		}
 	}
 }