[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.210,2.211
Max Horn
fingolfin at users.sourceforge.net
Fri Sep 5 15:54:05 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv21244
Modified Files:
gfx.cpp
Log Message:
some paranoid cleanup
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.210
retrieving revision 2.211
diff -u -d -r2.210 -r2.211
--- gfx.cpp 5 Sep 2003 20:35:00 -0000 2.210
+++ gfx.cpp 5 Sep 2003 22:53:25 -0000 2.211
@@ -1988,21 +1988,25 @@
#undef FILL_BITS
/* Ender - Zak256/Indy256 decoders */
-#define READ_256BIT \
- if ((mask <<= 1) == 256) { \
- buffer = *src++; \
- mask = 1; \
- } \
- bits = ((buffer & mask) != 0);
+#define READ_256BIT \
+ do { \
+ if ((mask <<= 1) == 256) { \
+ buffer = *src++; \
+ mask = 1; \
+ } \
+ bits = ((buffer & mask) != 0); \
+ } while (0)
-#define NEXT_ROW \
- dst += _vm->_screenWidth; \
- if (--h == 0) { \
- if (!--x) \
- return; \
- dst -= _vertStripNextInc; \
- h = height; \
- }
+#define NEXT_ROW \
+ do { \
+ dst += _vm->_screenWidth; \
+ if (--h == 0) { \
+ if (!--x) \
+ return; \
+ dst -= _vertStripNextInc; \
+ h = height; \
+ } \
+ } while (0)
void Gdi::unkDecode7(byte *dst, const byte *src, int height) {
uint h = height;
@@ -2011,7 +2015,7 @@
int x = 8;
for (;;) {
*dst = *src++;
- NEXT_ROW
+ NEXT_ROW;
}
return;
}
@@ -2038,7 +2042,7 @@
do {
*dst = color;
- NEXT_ROW
+ NEXT_ROW;
} while (--run);
}
}
@@ -2067,7 +2071,7 @@
}
for (i = 0; i < ((c & 3) + 2); i++) {
*dst = (run * 16 + color);
- NEXT_ROW
+ NEXT_ROW;
}
break;
@@ -2079,7 +2083,7 @@
color += bits << j;
}
*dst = (run * 16 + color);
- NEXT_ROW
+ NEXT_ROW;
}
break;
@@ -2108,13 +2112,13 @@
byte color = *src++;
if (color < numcolors) {
*dst = local_palette[color];
- NEXT_ROW
+ NEXT_ROW;
} else {
uint run = color - numcolors + 1;
color = *src++;
do {
*dst = color;
- NEXT_ROW
+ NEXT_ROW;
} while (--run);
}
}
@@ -2133,7 +2137,7 @@
*dst = color;
dst += _vm->_screenWidth;
for (i = 0; i < 3; i++) {
- READ_256BIT
+ READ_256BIT;
if (!bits)
break;
}
@@ -2151,7 +2155,7 @@
color = 0;
inc = 1;
for (i = 0; i < 8; i++) {
- READ_256BIT
+ READ_256BIT;
color += bits << i;
}
break;
More information about the Scummvm-git-logs
mailing list