diff options
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/gfx.cpp | 6 | ||||
-rw-r--r-- | scumm/script_v100he.cpp | 3 | ||||
-rw-r--r-- | scumm/script_v90he.cpp | 3 | ||||
-rw-r--r-- | scumm/sprite_he.cpp | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 92c0019641..99b846ebda 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -578,7 +578,7 @@ void Gdi::ditherCGA(byte *dst, int dstPitch, int x, int y, int width, int height void Gdi::ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int *width, int *height) const { byte *srcptr, *dstptr; int xo = *x, yo = *y, widtho = *width, heighto = *height; - int idx1, idx2, dsty = 0; + int idx1, idx2, dsty = 0, y1; static const byte cgaDither[2][2][16] = { {{0, 1, 0, 1, 2, 2, 0, 0, 3, 1, 3, 1, 3, 2, 1, 3}, {0, 0, 1, 1, 0, 2, 2, 3, 0, 3, 1, 1, 3, 3, 1, 3}}, @@ -586,7 +586,7 @@ void Gdi::ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int {0, 1, 0, 1, 2, 2, 0, 0, 3, 1, 1, 1, 3, 2, 1, 3}}}; // calculate dsty - for (int y1 = 0; y1 < yo; y1++) { + for (y1 = 0; y1 < yo; y1++) { dsty += 2; if (y1 % 4 == 3) dsty--; @@ -596,7 +596,7 @@ void Gdi::ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int *width *= 2; *height = 0; - for (int y1 = 0; y1 < heighto;) { + for (y1 = 0; y1 < heighto;) { srcptr = src + y1 * srcPitch; dstptr = hercbuf + dsty * Common::kHercW + xo * 2; diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index f61e880dd8..185da73358 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -1582,7 +1582,8 @@ void ScummEngine_v100he::o100_startSound() { void ScummEngine_v100he::o100_setSpriteInfo() { int args[16]; - int spriteId, n, tmp[2]; + int spriteId, n; + int32 tmp[2]; static int storedFields[2]; byte string[80]; diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 8df4eccf18..1d52129cdc 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -955,7 +955,8 @@ void ScummEngine_v90he::o90_getSpriteInfo() { void ScummEngine_v90he::o90_setSpriteInfo() { int args[16]; - int spriteId, tmp[2]; + int spriteId; + int32 tmp[2]; static int storedFields[2]; int n; diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp index 4afbbbca72..00bf0a0d05 100644 --- a/scumm/sprite_he.cpp +++ b/scumm/sprite_he.cpp @@ -1227,7 +1227,7 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) { int res_id, res_state; Common::Rect *bboxPtr; int rot_angle, zoom; - int w, h; + int32 w, h; WizParameters wiz; if (!_numSpritesToProcess) |