[Scummvm-cvs-logs] CVS: scummvm/scumm nut_renderer.cpp,1.14,1.15
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sun Jan 19 03:01:06 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17819/scumm
Modified Files:
nut_renderer.cpp
Log Message:
some cleanup
Index: nut_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- nut_renderer.cpp 15 Jan 2003 03:10:28 -0000 1.14
+++ nut_renderer.cpp 19 Jan 2003 11:00:14 -0000 1.15
@@ -36,8 +36,7 @@
void NutRenderer::decodeCodec44(byte *dst, byte *src, uint32 length) {
byte val;
- uint16 size_line;
- uint16 num;
+ uint16 size_line, num;
do {
size_line = READ_LE_UINT16(src);
@@ -51,16 +50,15 @@
dst += num;
length -= 2;
size_line -= 2;
- if (size_line == 0) break;
-
- num = READ_LE_UINT16(src) + 1;
- src += 2;
- memcpy(dst, src, num);
- dst += num;
- src += num;
- length -= num + 2;
- size_line -= num + 2;
-
+ if (size_line != 0) {
+ num = READ_LE_UINT16(src) + 1;
+ src += 2;
+ memcpy(dst, src, num);
+ dst += num;
+ src += num;
+ length -= num + 2;
+ size_line -= num + 2;
+ }
}
dst--;
@@ -162,35 +160,6 @@
return length;
}
-
-/*
-void NutRenderer::drawString(const char *string, int32 x, int32 y, byte color, int32 mode) {
- debug(2, "NutRenderer::drawString() called");
- if (_loaded == false) {
- debug(2, "NutRenderer::drawString() Font is not loaded");
- return;
- }
-
- int l = 0;
- int left = x;
- int height = 0, tmp;
- do {
- if ((x < 0) || (y < 0) || (x > _vm->_realWidth) || (y > _vm->_realHeight)) {
- debug(2, "NutRenderer::drawString() position x, y out of range");
- return;
- }
-
- drawChar(string[l], x, y, color);
- x += getCharWidth(string[l]);
- tmp = getCharHeight(string[l]);
- if (height < tmp)
- height = tmp;
- l++;
- } while (string[l] != 0);
-
- _vm->updateDirtyRect(0, left, x, y, y + height, 0);
-}
-*/
void NutRenderer::drawChar(char c, int32 x, int32 y, byte color, bool useMask) {
debug(2, "NutRenderer::drawChar('%c', %d, %d, %d, %d) called", c, x, y, (int)color, useMask);
More information about the Scummvm-git-logs
mailing list