[Scummvm-cvs-logs] CVS: scummvm/scumm nut_renderer.cpp,1.23,1.24 nut_renderer.h,1.6,1.7
Max Horn
fingolfin at users.sourceforge.net
Tue May 27 08:57:19 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.168,2.169 debugger.cpp,1.52,1.53
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.52,1.53 logic.h,1.17,1.18 screen.cpp,1.11,1.12 screen.h,1.2,1.3 sky.cpp,1.36,1.37 sky.h,1.24,1.25 skydefs.h,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv16394
Modified Files:
nut_renderer.cpp nut_renderer.h
Log Message:
increased nut font debug level to 8
Index: nut_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- nut_renderer.cpp 10 May 2003 21:49:57 -0000 1.23
+++ nut_renderer.cpp 27 May 2003 15:31:12 -0000 1.24
@@ -68,9 +68,9 @@
}
bool NutRenderer::loadFont(const char *filename, const char *dir) {
- debug(2, "NutRenderer::loadFont() called");
+ debug(8, "NutRenderer::loadFont() called");
if (_loaded == true) {
- debug(2, "NutRenderer::loadFont() Font already loaded, ok, loading...");
+ debug(8, "NutRenderer::loadFont() Font already loaded, ok, loading...");
}
File file;
@@ -82,7 +82,7 @@
uint32 tag = file.readUint32BE();
if (tag != 'ANIM') {
- debug(2, "NutRenderer::loadFont() there is no ANIM chunk in font header");
+ debug(8, "NutRenderer::loadFont() there is no ANIM chunk in font header");
return false;
}
@@ -97,7 +97,7 @@
file.close();
if (READ_BE_UINT32(_dataSrc) != 'AHDR') {
- debug(2, "NutRenderer::loadFont() there is no AHDR chunk in font header");
+ debug(8, "NutRenderer::loadFont() there is no AHDR chunk in font header");
free(_dataSrc);
_dataSrc = NULL;
return false;
@@ -113,11 +113,11 @@
_offsets[l] = offset + 8;
offset += READ_BE_UINT32(_dataSrc + offset + 4) + 8;
} else {
- debug(2, "NutRenderer::loadFont(%s, %s) there is no FOBJ chunk in FRME chunk %d (offset %x)", filename, dir, l, offset);
+ debug(8, "NutRenderer::loadFont(%s, %s) there is no FOBJ chunk in FRME chunk %d (offset %x)", filename, dir, l, offset);
break;
}
} else {
- debug(2, "NutRenderer::loadFont(%s, %s) there is no FRME chunk %d (offset %x)", filename, dir, l, offset);
+ debug(8, "NutRenderer::loadFont(%s, %s) there is no FRME chunk %d (offset %x)", filename, dir, l, offset);
break;
}
}
@@ -127,9 +127,9 @@
}
int32 NutRenderer::getCharWidth(byte c) {
- debug(2, "NutRenderer::getCharWidth() called");
+ debug(8, "NutRenderer::getCharWidth() called");
if (_loaded == false) {
- debug(2, "NutRenderer::getCharWidth() Font is not loaded");
+ debug(8, "NutRenderer::getCharWidth() Font is not loaded");
return 0;
}
@@ -137,36 +137,34 @@
}
int32 NutRenderer::getCharHeight(byte c) {
- debug(2, "NutRenderer::getCharHeight() called");
+ debug(8, "NutRenderer::getCharHeight() called");
if (_loaded == false) {
- debug(2, "NutRenderer::getCharHeight() Font is not loaded");
+ debug(8, "NutRenderer::getCharHeight() Font is not loaded");
return 0;
}
return READ_LE_UINT16(_dataSrc + _offsets[c] + 8);
}
-int32 NutRenderer::getStringWidth(byte *string) {
- debug(2, "NutRenderer::getStringWidth() called");
+int32 NutRenderer::getStringWidth(const byte *string) {
+ debug(8, "NutRenderer::getStringWidth() called");
if (_loaded == false) {
- debug(2, "NutRenderer::getStringWidth() Font is not loaded");
+ debug(8, "NutRenderer::getStringWidth() Font is not loaded");
return 0;
}
- int32 length = 0;
- int32 l = 0;
+ int32 width = 0;
- do {
- length += getCharWidth(string[l]);
- l++;
- } while (string[l] != 0);
+ while (*string) {
+ width += getCharWidth(*string++);
+ }
- return length;
+ return width;
}
void NutRenderer::drawChar(byte 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);
+ debug(8, "NutRenderer::drawChar('%c', %d, %d, %d, %d) called", c, x, y, (int)color, useMask);
if (_loaded == false) {
- debug(2, "NutRenderer::drawChar() Font is not loaded");
+ debug(8, "NutRenderer::drawChar() Font is not loaded");
return;
}
Index: nut_renderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- nut_renderer.h 6 Mar 2003 21:46:05 -0000 1.6
+++ nut_renderer.h 27 May 2003 15:31:13 -0000 1.7
@@ -45,7 +45,7 @@
// void drawString(const char *string, int32 x, int32 y, byte color, int32 mode);
int32 getCharWidth(byte c);
int32 getCharHeight(byte c);
- int32 getStringWidth(byte *string);
+ int32 getStringWidth(const byte *string);
};
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.168,2.169 debugger.cpp,1.52,1.53
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.52,1.53 logic.h,1.17,1.18 screen.cpp,1.11,1.12 screen.h,1.2,1.3 sky.cpp,1.36,1.37 sky.h,1.24,1.25 skydefs.h,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list