aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2010-07-23 10:53:21 +0000
committerPaul Gilbert2010-07-23 10:53:21 +0000
commitb062b413aab72035996d71d274e3f6a6f8702e15 (patch)
tree6653adc6c249690f4a0c9563c5c5af2b2a3cd09a
parent42851e047f9c8bef8d20a1854ff50dfd11a41741 (diff)
downloadscummvm-rg350-b062b413aab72035996d71d274e3f6a6f8702e15.tar.gz
scummvm-rg350-b062b413aab72035996d71d274e3f6a6f8702e15.tar.bz2
scummvm-rg350-b062b413aab72035996d71d274e3f6a6f8702e15.zip
Removed some old deprecated code that was drawing the status text a second time
svn-id: r51201
-rw-r--r--engines/m4/mads_scene.cpp13
-rw-r--r--engines/m4/mads_views.cpp4
2 files changed, 3 insertions, 14 deletions
diff --git a/engines/m4/mads_scene.cpp b/engines/m4/mads_scene.cpp
index 2ee60ae6d4..c459a2a58a 100644
--- a/engines/m4/mads_scene.cpp
+++ b/engines/m4/mads_scene.cpp
@@ -308,19 +308,6 @@ void MadsScene::update() {
drawElements();
_action.set();
- const char *sStatusText = _action.statusText();
-
- // Handle display of any status text
- if (sStatusText[0]) {
- // Text colors are inverted in Dragonsphere
- if (_vm->getGameType() == GType_DragonSphere)
- _vm->_font->current()->setColours(_vm->_palette->BLACK, _vm->_palette->WHITE, _vm->_palette->BLACK);
- else
- _vm->_font->current()->setColours(_vm->_palette->WHITE, _vm->_palette->BLACK, _vm->_palette->BLACK);
-
- _vm->_font->setFont(FONT_MAIN_MADS);
- _vm->_font->current()->writeString(this, sStatusText, (width() - _vm->_font->current()->getWidth(sStatusText)) / 2, 142, 0);
- }
}
void MadsScene::updateState() {
diff --git a/engines/m4/mads_views.cpp b/engines/m4/mads_views.cpp
index 6566b37c50..34218cebfd 100644
--- a/engines/m4/mads_views.cpp
+++ b/engines/m4/mads_views.cpp
@@ -242,8 +242,10 @@ void MadsAction::refresh() {
}
// Add a new text display entry to display the status text at the bottom of the screen area
+ uint colours = (_vm->getGameType() == GType_DragonSphere) ? 0x0300 : 0x0003;
+
_statusTextIndex = _owner._textDisplay.add(160 - (strWidth / 2),
- MADS_SURFACE_HEIGHT + _owner._posAdjust.y - 13, 3, textSpacing, _statusText, font);
+ MADS_SURFACE_HEIGHT + _owner._posAdjust.y - 13, colours, textSpacing, _statusText, font);
}
}