thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TOLTECS: Merged text drawing routines into drawString

Browse source
This commit is contained in:
Benjamin Haisch 2008-08-22 08:11:34 +00:00 • committed by Willem Jan Palenstijn
parent 3c326b5c40
commit 367be5b345
2 changed files with 44 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

73
engines/toltecs/screen.cpp
View file

@ -589,9 +589,9 @@ void Screen::drawSpriteCore(byte *dest, SpriteFilter &reader, SpriteDrawItem *sp
} }
dest = destp + 640; dest = destp + 640;
destp = dest; destp = dest;
skipX = sprite->skipX; skipX = sprite->skipX;
w = sprite->width; w = sprite->width;
h--; h--;
} }
} while (status != kSrsEndOfSprite && h > 0); } while (status != kSrsEndOfSprite && h > 0);
@ -651,7 +651,7 @@ void Screen::updateVerbLine(int16 slotIndex, int16 slotOffset) {
byte ch = *sourceString--; byte ch = *sourceString--;
_tempStringLen1--; _tempStringLen1--;
len--; len--;
charWidth = font.getCharWidth(ch) + font.getSpacing() - 1; charWidth = font.getCharWidth(ch) + font.getSpacing() - 1;
width -= charWidth; width -= charWidth;
} }
width += charWidth; width += charWidth;
@ -659,9 +659,9 @@ void Screen::updateVerbLine(int16 slotIndex, int16 slotOffset) {
_tempStringLen1 -= len; _tempStringLen1 -= len;
_tempStringLen2 = len + 1; _tempStringLen2 = len + 1;
drawString(_verbLineX - 1 - (width / 2), y, 0xF9, 0xFF, _fontResIndexArray[0]); drawStringEx(_verbLineX - 1 - (width / 2), y, 0xF9, 0xFF, _fontResIndexArray[0]);
destString = _tempString; destString = _tempString;
width = 0; width = 0;
preprocessText(_fontResIndexArray[0], _verbLineWidth, width, sourceString, destString, len); preprocessText(_fontResIndexArray[0], _verbLineWidth, width, sourceString, destString, len);
@ -674,7 +674,7 @@ void Screen::updateVerbLine(int16 slotIndex, int16 slotOffset) {
_tempStringLen1 -= len; _tempStringLen1 -= len;
_tempStringLen2 = len; _tempStringLen2 = len;
drawString(_verbLineX - 1 - (width / 2), y, 0xF9, 0xFF, _fontResIndexArray[0]); drawStringEx(_verbLineX - 1 - (width / 2), y, 0xF9, 0xFF, _fontResIndexArray[0]);
} }
@ -719,7 +719,7 @@ void Screen::updateTalkText(int16 slotIndex, int16 slotOffset) {
width = 0; width = 0;
length = 0; length = 0;
item->duration = 0; item->duration = 0;
item->rectCount = 0; item->rectCount = 0;
Font font(_vm->_res->load(_fontResIndexArray[item->fontNum])); Font font(_vm->_res->load(_fontResIndexArray[item->fontNum]));
@ -792,8 +792,6 @@ void Screen::addTalkTextRect(Font &font, int16 x, int16 &y, int16 length, int16
void Screen::drawTalkTextItems() { void Screen::drawTalkTextItems() {
//debug(0, "## _talkTextItemNum = %d", _talkTextItemNum);
for (int16 i = 0; i <= _talkTextItemNum; i++) { for (int16 i = 0; i <= _talkTextItemNum; i++) {
TalkTextItem *item = &_talkTextItems[i]; TalkTextItem *item = &_talkTextItems[i];
byte *text = _vm->_script->getSlotData(item->slotIndex) + item->slotOffset; byte *text = _vm->_script->getSlotData(item->slotIndex) + item->slotOffset;
@ -805,20 +803,10 @@ void Screen::drawTalkTextItems() {
if (item->duration < 0) if (item->duration < 0)
item->duration = 0; item->duration = 0;
Font font(_vm->_res->load(_fontResIndexArray[item->fontNum]));
for (byte j = 0; j < item->rectCount; j++) { for (byte j = 0; j < item->rectCount; j++) {
int16 x = item->rects[j].x; drawString(item->rects[j].x, item->rects[j].y, item->color, _fontResIndexArray[item->fontNum],
for (byte pos = 0; pos < item->rects[j].length; pos++) { text, item->rects[j].length, NULL, true);
byte ch = *text++; text += item->rects[j].length;
if (ch < 0x20)
continue;
if (ch == 0x20) {
x += font.getWidth();
} else {
drawChar(font, _frontScreen, x, item->rects[j].y, ch, item->color, true);
x += font.getCharWidth(ch) + font.getSpacing() - 1;
}
}
} }
} }
@ -862,7 +850,7 @@ void Screen::printText(byte *textData) {
int width = 0; int width = 0;
_tempStringLen1 = 0; _tempStringLen1 = 0;
preprocessText(_fontResIndexArray[1], 640, width, textData, destString, _tempStringLen2); preprocessText(_fontResIndexArray[1], 640, width, textData, destString, _tempStringLen2);
drawString(x - width / 2, y, _fontColor1, _fontColor2, _fontResIndexArray[1]); drawStringEx(x - width / 2, y, _fontColor1, _fontColor2, _fontResIndexArray[1]);
} }
} while (*textData != 0xFF); } while (*textData != 0xFF);
@ -889,31 +877,46 @@ void Screen::preprocessText(uint fontResIndex, int maxWidth, int &width, byte *&
} }
} }
void Screen::drawString(int16 x, int16 y, byte fontColor1, byte fontColor2, uint fontResIndex) { void Screen::drawStringEx(int16 x, int16 y, byte fontColor1, byte fontColor2, uint fontResIndex) {
debug(0, "Screen::drawString(%d, %d, %d, %d, %d) _tempStringLen1 = %d; _tempStringLen2 = %d", x, y, fontColor1, fontColor2, fontResIndex, _tempStringLen1, _tempStringLen2); debug(0, "Screen::drawStringEx(%d, %d, %d, %d, %d) _tempStringLen1 = %d; _tempStringLen2 = %d", x, y, fontColor1, fontColor2, fontResIndex, _tempStringLen1, _tempStringLen2);
int16 ywobble = 1;
x = drawString(x + 1, y + _vm->_cameraHeight, fontColor1, fontResIndex, _tempString, _tempStringLen1, &ywobble, false);
x = drawString(x, y + _vm->_cameraHeight, fontColor2, fontResIndex, _tempString + _tempStringLen1, _tempStringLen2, &ywobble, false);
}
int16 Screen::drawString(int16 x, int16 y, byte color, uint fontResIndex, byte *text, int len, int16 *ywobble, bool outline) {
debug(0, "Screen::drawString(%d, %d, %d, %d)", x, y, color, fontResIndex);
Font font(_vm->_res->load(fontResIndex)); Font font(_vm->_res->load(fontResIndex));
byte color = fontColor1; if (len == -1)
byte *text = _tempString; len = strlen((char*)text);
byte len = _tempStringLen1 + _tempStringLen2;
int16 yadd = 1;
for (byte pos = 0; pos < len; pos++) { int16 yadd = 0;
if (pos == _tempStringLen1) { if (ywobble)
color = fontColor2; yadd = *ywobble;
}
while (len--) {
byte ch = *text++; byte ch = *text++;
if (ch <= 0x20) { if (ch <= 0x20) {
x += font.getWidth(); x += font.getWidth();
} else { } else {
drawChar(font, _frontScreen, x + 1, y + _vm->_cameraHeight - yadd, ch, color, false); drawChar(font, _frontScreen, x, y - yadd, ch, color, outline);
x += font.getCharWidth(ch) + font.getSpacing() - 1; x += font.getCharWidth(ch) + font.getSpacing() - 1;
yadd = -yadd; yadd = -yadd;
} }
} }
if (ywobble)
*ywobble = yadd;
return x;
} }
void Screen::drawChar(const Font &font, byte *dest, int16 x, int16 y, byte ch, byte color, bool outline) { void Screen::drawChar(const Font &font, byte *dest, int16 x, int16 y, byte ch, byte color, bool outline) {

5
engines/toltecs/screen.h
View file

@ -333,8 +333,11 @@ public:
void registerFont(uint fontIndex, uint resIndex); void registerFont(uint fontIndex, uint resIndex);
void printText(byte *textData); void printText(byte *textData);
void preprocessText(uint fontResIndex, int maxWidth, int &width, byte *&sourceString, byte *&destString, byte &len); void preprocessText(uint fontResIndex, int maxWidth, int &width, byte *&sourceString, byte *&destString, byte &len);
void drawString(int16 x, int16 y, byte fontColor1, byte fontColor2, uint fontResIndex); void drawStringEx(int16 x, int16 y, byte fontColor1, byte fontColor2, uint fontResIndex);
int16 drawString(int16 x, int16 y, byte color, uint fontResIndex, byte *text, int len = -1, int16 *ywobble = NULL, bool outline = false);
void drawChar(const Font &font, byte *dest, int16 x, int16 y, byte ch, byte color, bool outline); void drawChar(const Font &font, byte *dest, int16 x, int16 y, byte ch, byte color, bool outline);
void saveState(Common::WriteStream *out); void saveState(Common::WriteStream *out);
void loadState(Common::ReadStream *in); void loadState(Common::ReadStream *in);