aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/access/bubble_box.cpp2
-rw-r--r--engines/access/martian/martian_game.cpp5
-rw-r--r--engines/access/scripts.cpp5
3 files changed, 5 insertions, 7 deletions
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 43333c9220..c9097bb33c 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -169,7 +169,7 @@ void BubbleBox::printBubble_v1(const Common::String &msg) {
Font &font2 = _vm->_fonts._font2;
lastLine = font2.getLine(s, _vm->_screen->_maxChars * 6, line, width);
// Draw the text
- font2.drawString(_vm->_screen, line, _vm->_screen->_printOrg);
+ PRINTSTR(line);
// Move print position
_vm->_screen->_printOrg.y += 6;
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index 7572d360c3..69ca4d3a5a 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -114,7 +114,7 @@ void MartianEngine::displayNote(const Common::String &msg) {
bool lastLine = false;
do {
lastLine = _fonts._font1.getLine(lines, _screen->_maxChars * 6, line, width);
- _fonts._font1.drawString(_screen, line, _screen->_printOrg);
+ _bubbleBox->PRINTSTR(line);
_screen->_printOrg = Common::Point(_screen->_printStart.x, _screen->_printOrg.y + 6);
if (_screen->_printOrg.y == 196) {
@@ -313,9 +313,8 @@ void MartianEngine::showDeathText(Common::String msg) {
bool lastLine;
do {
lastLine = _fonts._font2.getLine(msg, _screen->_maxChars * 6, line, width);
- warning("TODO: use printString");
// Draw the text
- _fonts._font2.drawString(_screen, line, _screen->_printOrg);
+ _bubbleBox->PRINTSTR(line);
_screen->_printOrg.y += 6;
_screen->_printOrg.x = _screen->_printStart.x;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 8bb68e5eb5..db9053039c 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -202,9 +202,8 @@ void Scripts::printWatch() {
bool lastLine;
do {
lastLine = _vm->_fonts._font2.getLine(msg, _vm->_screen->_maxChars * 6, line, width);
- warning("TODO: use printString");
// Draw the text
- _vm->_fonts._font2.drawString(_vm->_screen, line, _vm->_screen->_printOrg);
+ _vm->_bubbleBox->PRINTSTR(line);
_vm->_screen->_printOrg.y += 6;
_vm->_screen->_printOrg.x = _vm->_screen->_printStart.x;
@@ -688,7 +687,7 @@ void Scripts::cmdDoTravel() {
int idx = _vm->_travelBox->_tempListIdx[boxX];
if (Martian::_byte1EEB5[idx] != _vm->_byte26CB5) {
_vm->_bubbleBox->_bubbleTitle = "TRAVEL";
- _vm->_scripts->printString("YOU CAN'T GET THERE FROM HERE.");
+ _vm->_bubbleBox->PRINTSTR("YOU CAN'T GET THERE FROM HERE.");
continue;
}
if (_vm->_player->_roomNumber != idx) {