aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorFilippos Karapetis2011-10-14 20:28:39 +0300
committerFilippos Karapetis2011-10-14 20:30:22 +0300
commit8609e22e404c06c20c6726ee38425fa4436b6c11 (patch)
tree031fd324103633aa2acae11b2e1fca7a624e0372 /engines/sci
parent49b4298f7d0a70cc1975fc288cb35b2ea05ae426 (diff)
downloadscummvm-rg350-8609e22e404c06c20c6726ee38425fa4436b6c11.tar.gz
scummvm-rg350-8609e22e404c06c20c6726ee38425fa4436b6c11.tar.bz2
scummvm-rg350-8609e22e404c06c20c6726ee38425fa4436b6c11.zip
SCI: Silenced warnings
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/engine/kgraphics.cpp8
-rw-r--r--engines/sci/graphics/text32.cpp6
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 0d5b5864ab..fd8e9ee9f0 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 0d4f8deb35..606a9359ac 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);
}
}
}