[Scummvm-cvs-logs] SF.net SVN: scummvm: [21933] scummvm/trunk/engines/simon/items.cpp

[kirben at users.sourceforge.net]

Revision: 21933
Author:   kirben
Date:     2006-04-16 03:12:33 -0700 (Sun, 16 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21933&view=rev

Log Message:
-----------
Fix cursor colors in chemsitry set for FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/items.cpp
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-16 09:52:10 UTC (rev 21932)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-16 10:12:33 UTC (rev 21933)
@@ -1314,12 +1314,15 @@
 
 void SimonEngine::o_playEffect() {
 	// 163: play sound
-	uint sound_id = getVarOrWord();
+	uint soundId = getVarOrWord();
 
+	if (getGameType() == GType_FF)
+		error("o_playEffect: triggered");
+
 	if (getGameId() == GID_SIMON1DOS)
-		playSting(sound_id);
+		playSting(soundId);
 	else
-		_sound->playEffects(sound_id);
+		_sound->playEffects(soundId);
 }
 
 void SimonEngine::o_getDollar2() {
@@ -1977,16 +1980,16 @@
 
 void SimonEngine::o3_setColour() {
 	// 195: set palette colour
+	uint c = getVarOrByte() * 4;
+	uint r = getVarOrByte();
+	uint g = getVarOrByte();
 	uint b = getVarOrByte();
-	uint g = getVarOrByte();
-	uint r = getVarOrByte();
-	uint c = getVarOrByte() * 4;
 
-	_palette[c + 0] = _paletteBackup[c + 0] = r;
-	_palette[c + 1] = _paletteBackup[c + 1] = g;
-	_palette[c + 2] = _paletteBackup[c + 2] = b;
+	_palette[c + 0] = r;
+	_palette[c + 1] = g;
+	_palette[c + 2] = b;
 
-	debug(0, "o3_setColour (%d, %d, %d, %d)", c, r, g, b);
+	_paletteFlag = 2;
 }
 
 void SimonEngine::o3_b3Set() {


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