diff options
| author | Tony Puccinelli | 2010-08-11 01:11:16 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-08-11 01:11:16 +0000 |
| commit | 3a7a0ba720f219c4780cf19d196cda9c0456a20b (patch) | |
| tree | fe7f45242447dc7d14447babbdea9fbbb771c506 /engines/m4/converse.cpp | |
| parent | 6543062e5701e8011a4b12abffa8afca56f30b3f (diff) | |
| parent | fffec23a02cc88ed8daba0a3b50007b7e220c075 (diff) | |
| download | scummvm-rg350-3a7a0ba720f219c4780cf19d196cda9c0456a20b.tar.gz scummvm-rg350-3a7a0ba720f219c4780cf19d196cda9c0456a20b.tar.bz2 scummvm-rg350-3a7a0ba720f219c4780cf19d196cda9c0456a20b.zip | |
manually merged engines from trunk into branch
svn-id: r51964
Diffstat (limited to 'engines/m4/converse.cpp')
| -rw-r--r-- | engines/m4/converse.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/m4/converse.cpp b/engines/m4/converse.cpp index aab2fc95ce..af26a86313 100644 --- a/engines/m4/converse.cpp +++ b/engines/m4/converse.cpp @@ -96,7 +96,7 @@ void ConversationView::setNode(int32 nodeIndex) { _vm->_font->setFont(FONT_CONVERSATION); // TODO: Conversation styles and colors - _vm->_font->setColors(2, 1, 3); + _vm->_font->current()->setColours(2, 1, 3); _currentNodeIndex = nodeIndex; @@ -124,7 +124,7 @@ void ConversationView::setNode(int32 nodeIndex) { } // Figure out the longest string to determine where option highlighting ends - int tempX = _vm->_font->getWidth(node->entries[i]->text, 0) + + int tempX = _vm->_font->current()->getWidth(node->entries[i]->text, 0) + CONV_ENTRIES_X_OFFSET + 10; _xEnd = MAX(_xEnd, tempX); } @@ -163,10 +163,10 @@ void ConversationView::onRefresh(RectList *rects, M4Surface *destSurface) { if (i > CONV_MAX_SHOWN_ENTRIES - 1) break; - _vm->_font->setColor((_highlightedIndex == i) ? CONVERSATION_ENTRY_HIGHLIGHTED : + _vm->_font->current()->setColour((_highlightedIndex == i) ? CONVERSATION_ENTRY_HIGHLIGHTED : CONVERSATION_ENTRY_NORMAL); - _vm->_font->writeString(this, _activeItems[i]->text, CONV_ENTRIES_X_OFFSET, + _vm->_font->current()->writeString(this, _activeItems[i]->text, CONV_ENTRIES_X_OFFSET, CONV_ENTRIES_Y_OFFSET + CONV_ENTRIES_HEIGHT * i, 0, 0); } } |