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

[dreammaster at users.sourceforge.net]

Revision: 49211
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49211&view=rev
Author:   dreammaster
Date:     2010-05-25 11:54:18 +0000 (Tue, 25 May 2010)

Log Message:
-----------
Bugfix to allow timed text to display in the correct colours

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

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-25 11:35:16 UTC (rev 49210)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-05-25 11:54:18 UTC (rev 49211)
@@ -59,8 +59,8 @@
 //	if ((_sceneNumber == 105) ((_sceneNumber == 109) && (word_84800 != 0)))
 //		_madsVm->globals()->playerSpriteChanged = true;
 
-//	_vm->_palette->setEntry(16, 0x38, 0xFF, 0xFF);
-//	_vm->_palette->setEntry(17, 0x38, 0xb4, 0xb4);
+	_vm->_palette->setEntry(16, 0x38, 0xFF, 0xFF);
+	_vm->_palette->setEntry(17, 0x38, 0xb4, 0xb4);
 }
 
 void MadsSceneLogic::getAnimName() {
@@ -169,7 +169,9 @@
 
 //	sub_1e754(animName, 3);
 
-	getSceneSpriteSet();
+	if ((_sceneNumber >= 101) && (_sceneNumber <= 112))
+		getSceneSpriteSet();
+
 	getAnimName();
 }
 

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-25 11:35:16 UTC (rev 49210)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-05-25 11:54:18 UTC (rev 49211)
@@ -78,7 +78,7 @@
 void MadsScene::loadSceneTemporary() {
 	/* Existing code that eventually needs to be replaced with the proper MADS code */
 	// Set system palette entries
-	_vm->_palette->blockRange(0, 7);
+	_vm->_palette->blockRange(0, 18);
 	RGB8 sysColors[3] = { {0x1f<<2, 0x2d<<2, 0x31<<2, 0}, {0x24<<2, 0x37<<2, 0x3a<<2, 0},
 		{0x00<<2, 0x10<<2, 0x16<<2, 0}};
 	_vm->_palette->setPalette(&sysColors[0], 4, 3);


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