diff options
| author | Jonathan Gray | 2003-03-03 21:48:22 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-03-03 21:48:22 +0000 |
| commit | aa2259c5a91a29cef5b258165e4839d03cce4e8e (patch) | |
| tree | f700a50cd3f393799e34e26bf9bd443ef13a1438 | |
| parent | cf13cd3f33c96961e0ed3345d86e2921f016ed5b (diff) | |
| download | scummvm-rg350-aa2259c5a91a29cef5b258165e4839d03cce4e8e.tar.gz scummvm-rg350-aa2259c5a91a29cef5b258165e4839d03cce4e8e.tar.bz2 scummvm-rg350-aa2259c5a91a29cef5b258165e4839d03cce4e8e.zip | |
fix shadowed variable problems
svn-id: r6675
| -rw-r--r-- | scumm/smush/codec37.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scumm/smush/codec37.cpp b/scumm/smush/codec37.cpp index ca855fdc23..0c7b76f209 100644 --- a/scumm/smush/codec37.cpp +++ b/scumm/smush/codec37.cpp @@ -327,11 +327,11 @@ void Codec37Decoder::bompDecode(byte *dst, byte *src, int32 len) { #define LITERAL_4X4(src, dst, pitch) \ do { \ - int i; \ + int x; \ DECLARE_LITERAL_TEMP(t); \ READ_LITERAL_PIXEL(src, t); \ - for(i=0; i<4; i++) { \ - WRITE_4X1_LINE(dst + pitch * i, t); \ + for(x=0; x<4; x++) { \ + WRITE_4X1_LINE(dst + pitch * x, t); \ } \ dst += 4; \ } while(0) @@ -341,11 +341,11 @@ void Codec37Decoder::bompDecode(byte *dst, byte *src, int32 len) { #define LITERAL_4X1(src, dst, pitch) \ do { \ - int i; \ + int x; \ DECLARE_LITERAL_TEMP(t); \ - for(i=0; i<4; i++) { \ + for(x=0; x<4; x++) { \ READ_LITERAL_PIXEL(src, t); \ - WRITE_4X1_LINE(dst + pitch * i, t); \ + WRITE_4X1_LINE(dst + pitch * x, t); \ } \ dst += 4; \ } while(0) @@ -355,9 +355,9 @@ void Codec37Decoder::bompDecode(byte *dst, byte *src, int32 len) { #define LITERAL_1X1(src, dst, pitch) \ do { \ - int i; \ - for(i=0; i<4; i++) { \ - COPY_4X1_LINE(dst + pitch * i, src); \ + int x; \ + for(x=0; x<4; x++) { \ + COPY_4X1_LINE(dst + pitch * x, src); \ src += 4; \ } \ dst += 4; \ @@ -368,9 +368,9 @@ void Codec37Decoder::bompDecode(byte *dst, byte *src, int32 len) { #define COPY_4X4(dst2, dst, pitch) \ do { \ - int i; \ - for(i=0; i<4; i++) { \ - COPY_4X1_LINE(dst + pitch * i, dst2 + pitch * i); \ + int x; \ + for(x=0; x<4; x++) { \ + COPY_4X1_LINE(dst + pitch * x, dst2 + pitch * x); \ } \ dst += 4; \ } while(0) |