diff options
| author | Paul Gilbert | 2018-07-20 19:05:56 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2018-07-20 19:05:56 -0700 |
| commit | af6034efcdf9ff12e037f03626caf2c89c11a6ed (patch) | |
| tree | d08635577aca00bcbc6475276e2836de63b17e89 /engines/access/bubble_box.cpp | |
| parent | b6dc832346ef1a70390970430f604d6b4625d268 (diff) | |
| download | scummvm-rg350-af6034efcdf9ff12e037f03626caf2c89c11a6ed.tar.gz scummvm-rg350-af6034efcdf9ff12e037f03626caf2c89c11a6ed.tar.bz2 scummvm-rg350-af6034efcdf9ff12e037f03626caf2c89c11a6ed.zip | |
ACCESS: MM: Implement proper game data and fonts in access.dat
Diffstat (limited to 'engines/access/bubble_box.cpp')
| -rw-r--r-- | engines/access/bubble_box.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp index 29b58a3f1b..063062291d 100644 --- a/engines/access/bubble_box.cpp +++ b/engines/access/bubble_box.cpp @@ -106,7 +106,7 @@ void BubbleBox::calcBubble(const Common::String &msg) { if (_type == kBoxTypeFileDialog) { _vm->_fonts._printMaxX = 110; } else { - _vm->_fonts._printMaxX = _vm->_fonts._font2.stringWidth(_bubbleDisplStr); + _vm->_fonts._printMaxX = _vm->_fonts._font2->stringWidth(_bubbleDisplStr); } // Start of with a rect with the given starting x and y @@ -118,7 +118,7 @@ void BubbleBox::calcBubble(const Common::String &msg) { int width = 0; bool lastLine; do { - lastLine = _vm->_fonts._font2.getLine(s, screen._maxChars * 6, line, width); + lastLine = _vm->_fonts._font2->getLine(s, screen._maxChars * 6, line, width); _vm->_fonts._printMaxX = MAX(width, _vm->_fonts._printMaxX); screen._printOrg.y += 6; @@ -173,7 +173,7 @@ void BubbleBox::printBubble_v1(const Common::String &msg) { bool lastLine; do { // Get next line - Font &font2 = _vm->_fonts._font2; + Font &font2 = *_vm->_fonts._font2; lastLine = font2.getLine(s, _vm->_screen->_maxChars * 6, line, width); // Draw the text printString(line); @@ -195,7 +195,7 @@ void BubbleBox::printBubble_v2(const Common::String &msg) { bool lastLine; do { // Get next line - Font &font2 = _vm->_fonts._font2; + Font &font2 = *_vm->_fonts._font2; lastLine = font2.getLine(s, _vm->_screen->_maxChars * 6, line, width); // Set font colors @@ -309,8 +309,8 @@ void BubbleBox::doBox(int item, int box) { } // Handle drawing title - int titleWidth = _vm->_fonts._font2.stringWidth(_bubbleDisplStr); - Font &font2 = _vm->_fonts._font2; + int titleWidth = _vm->_fonts._font2->stringWidth(_bubbleDisplStr); + Font &font2 = *_vm->_fonts._font2; font2._fontColors[0] = 0; font2._fontColors[1] = 3; font2._fontColors[2] = 2; @@ -338,7 +338,7 @@ void BubbleBox::setCursorPos(int posX, int posY) { void BubbleBox::printString(Common::String msg) { warning("TODO: Proper implementation of printString"); - _vm->_fonts._font1.drawString(_vm->_screen, msg, _vm->_screen->_printOrg); + _vm->_fonts._font1->drawString(_vm->_screen, msg, _vm->_screen->_printOrg); } void BubbleBox::displayBoxData() { @@ -605,7 +605,7 @@ int BubbleBox::doBox_v1(int item, int box, int &btnSelected) { setCursorPos(newX, newY); _vm->_fonts._charFor._lo = 0xFF; - _vm->_fonts._font1.drawString(_vm->_screen, _bubbleDisplStr, _vm->_screen->_printOrg); + _vm->_fonts._font1->drawString(_vm->_screen, _bubbleDisplStr, _vm->_screen->_printOrg); if (_type == TYPE_2) { _vm->_events->showCursor(); |