diff options
author | Sven Hesse | 2009-07-05 19:57:55 +0000 |
---|---|---|
committer | Sven Hesse | 2009-07-05 19:57:55 +0000 |
commit | d6c99ae861aa857b24023ecc66bd1507fa895ecd (patch) | |
tree | f089938e95d2d5ee798e377cc53802d679543e97 /engines/gob/hotspots.cpp | |
parent | 62fcf1177d7782fd30ec908676e3cd287d0ae507 (diff) | |
download | scummvm-rg350-d6c99ae861aa857b24023ecc66bd1507fa895ecd.tar.gz scummvm-rg350-d6c99ae861aa857b24023ecc66bd1507fa895ecd.tar.bz2 scummvm-rg350-d6c99ae861aa857b24023ecc66bd1507fa895ecd.zip |
Renaming FontDesc::extraData to charWidths
svn-id: r42149
Diffstat (limited to 'engines/gob/hotspots.cpp')
-rw-r--r-- | engines/gob/hotspots.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp index ca345f690c..7cbefcc922 100644 --- a/engines/gob/hotspots.cpp +++ b/engines/gob/hotspots.cpp @@ -713,7 +713,7 @@ void Hotspots::getTextCursorPos(const Video::FontDesc &font, const char *str, uint32 pos, uint16 x, uint16 y, uint16 width, uint16 height, uint16 &cursorX, uint16 &cursorY, uint16 &cursorWidth, uint16 &cursorHeight) const { - if (font.extraData) { + if (font.charWidths) { // Cursor to the right of the current character cursorX = x; @@ -722,7 +722,7 @@ void Hotspots::getTextCursorPos(const Video::FontDesc &font, const char *str, cursorHeight = height; for (uint32 i = 0; i < pos; i++) - cursorX += font.extraData[str[i] - font.startItem]; + cursorX += font.charWidths[str[i] - font.startItem]; } else { // Cursor underlining the current character @@ -748,7 +748,7 @@ uint16 Hotspots::readString(uint16 xPos, uint16 yPos, uint16 width, uint16 heigh const Video::FontDesc &font = *_vm->_draw->_fonts[fontIndex]; - bool monoSpaced = (font.extraData == 0); + bool monoSpaced = (font.charWidths == 0); uint32 pos = strlen(str); uint32 editSize = monoSpaced ? (width / font.itemWidth) : 0; @@ -925,8 +925,8 @@ uint16 Hotspots::readString(uint16 xPos, uint16 yPos, uint16 width, uint16 heigh if ((key >= ' ') && (key <= 0xFF)) { if (editSize == 0) { int length = _vm->_draw->stringLength(str, fontIndex) + - font.extraData[' ' - font.startItem] + - font.extraData[key - font.startItem]; + font.charWidths[' ' - font.startItem] + + font.charWidths[key - font.startItem]; if (length > width) continue; @@ -1258,7 +1258,7 @@ void Hotspots::evaluateNew(uint16 i, uint16 *ids, InputDesc *inputs, } font = _vm->_draw->_fonts[inputs[inputCount].fontIndex]; - if (!font->extraData) + if (!font->charWidths) right = left + width * font->itemWidth - 1; funcEnter = 0; |