[Scummvm-cvs-logs] SF.net SVN: scummvm:[51201] scummvm/trunk/engines/m4

[dreammaster at users.sourceforge.net]

Revision: 51201
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51201&view=rev
Author:   dreammaster
Date:     2010-07-23 10:53:21 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
Removed some old deprecated code that was drawing the status text a second time

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/engines/m4/mads_views.cpp

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-07-23 09:49:40 UTC (rev 51200)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-07-23 10:53:21 UTC (rev 51201)
@@ -308,19 +308,6 @@
 	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() {

Modified: scummvm/trunk/engines/m4/mads_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_views.cpp	2010-07-23 09:49:40 UTC (rev 51200)
+++ scummvm/trunk/engines/m4/mads_views.cpp	2010-07-23 10:53:21 UTC (rev 51201)
@@ -242,8 +242,10 @@
 			}
 
 			// 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);
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.