aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/charset.cpp
diff options
context:
space:
mode:
authorGregory Montoir2007-05-13 02:16:34 +0000
committerGregory Montoir2007-05-13 02:16:34 +0000
commitea3b55a655936d4ac87635ec101813be8ace0d01 (patch)
tree96b600f39777277ee4d47e98186a41ed8caaf6a6 /engines/scumm/charset.cpp
parenta05d455ae8b3fde50b7cc4b8340bad83301acc31 (diff)
downloadscummvm-rg350-ea3b55a655936d4ac87635ec101813be8ace0d01.tar.gz
scummvm-rg350-ea3b55a655936d4ac87635ec101813be8ace0d01.tar.bz2
scummvm-rg350-ea3b55a655936d4ac87635ec101813be8ace0d01.zip
removed part of my patch for bug #1662610, CharsetRenderer::getStringHeight() is never used
svn-id: r26821
Diffstat (limited to 'engines/scumm/charset.cpp')
-rw-r--r--engines/scumm/charset.cpp38
1 files changed, 0 insertions, 38 deletions
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 92642faaa5..654a7fd6c3 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -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;