aboutsummaryrefslogtreecommitdiff
path: root/scumm/gfx.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2005-02-25 20:15:01 +0000
committerPaweł Kołodziejski2005-02-25 20:15:01 +0000
commita73906443b9aeb5a64344511895b0525b32a18fe (patch)
tree9ae14b8f056925145f7a491e6205387b95d36c86 /scumm/gfx.cpp
parent531ca3704075b6bed56008eb60ec2e539f7b6f5c (diff)
downloadscummvm-rg350-a73906443b9aeb5a64344511895b0525b32a18fe.tar.gz
scummvm-rg350-a73906443b9aeb5a64344511895b0525b32a18fe.tar.bz2
scummvm-rg350-a73906443b9aeb5a64344511895b0525b32a18fe.zip
fixed compilation for emsvc4
svn-id: r16917
Diffstat (limited to 'scumm/gfx.cpp')
-rw-r--r--scumm/gfx.cpp6
1 files changed, 3 insertions, 3 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;