libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed part of my patch for bug #1662610, CharsetRenderer::getStringHeight() is never used

Browse Source 
svn-id: r26821
This commit is contained in:
Gregory Montoir 2007-05-13 02:16:34 +00:00
parent a05d455ae8
commit ea3b55a655
2 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
engines/scumm/charset.cpp
View File

@ -348,44 +348,6 @@ int CharsetRenderer::getStringWidth(int arg, const byte *text) {
return width;
}
int CharsetRenderer::getStringHeight(const byte *text) {
int pos = 0;
int height = 0;
byte chr;
int oldID = getCurID();
while ((chr = text[pos++]) != 0) {
if (chr == '\n' || chr == '\r')
break;
if (chr == '@')
continue;
if (chr == 255 || (_vm->_game.version <= 6 && chr == 254)) {
chr = text[pos++];
if (chr == 3) { // 'WAIT'
height += getFontHeight();
break;
}
if (chr == 10 || chr == 21 || chr == 12 || chr == 13) {
pos += 2;
continue;
}
if (chr == 9 || chr == 1 || chr == 2) { // 'Newline'
height += getFontHeight();
continue;
}
if (chr == 14) {
int set = text[pos] | (text[pos + 1] << 8);
pos += 2;
setCurID(set);
continue;
}
}
}
setCurID(oldID);
return height + getFontHeight();
}
void CharsetRenderer::addLinebreaks(int a, byte *str, int pos, int maxwidth) {
int lastspace = -1;
int curw = 1;

1
engines/scumm/charset.h
View File

@ -73,7 +73,6 @@ public:
virtual void drawChar(int chr, const Graphics::Surface &s, int x, int y) {}
int getStringWidth(int a, const byte *str);
int getStringHeight(const byte *text);
void addLinebreaks(int a, byte *str, int pos, int maxwidth);
void translateColor();