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

[dreammaster at users.sourceforge.net]

Revision: 48403
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48403&view=rev
Author:   dreammaster
Date:     2010-03-26 09:35:48 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
Bugfix for logic used to calculate single RGB palette entries

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

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2010-03-25 12:54:55 UTC (rev 48402)
+++ scummvm/trunk/engines/m4/graphics.cpp	2010-03-26 09:35:48 UTC (rev 48403)
@@ -768,7 +768,7 @@
 }
 
 void Palette::setEntry(uint index, uint8 r, uint8 g, uint8 b) {
-	uint32 c = (r << 16) | (g << 8) || b;
+	uint32 c = (r << 16) | (g << 8) | b;
 	g_system->setPalette((const byte *)&c, index, 1);
 }
 

Modified: scummvm/trunk/engines/m4/mads_logic.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_logic.cpp	2010-03-25 12:54:55 UTC (rev 48402)
+++ scummvm/trunk/engines/m4/mads_logic.cpp	2010-03-26 09:35:48 UTC (rev 48403)
@@ -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() {


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