[Scummvm-cvs-logs] SF.net SVN: scummvm: [20967] scummvm/trunk/engines/scumm/script_v5.cpp

[kirben at users.sourceforge.net]

Revision: 20967
Author:   kirben
Date:     2006-02-27 17:14:02 -0800 (Mon, 27 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20967&view=rev

Log Message:
-----------
These zakTowns specific changes aren't explained and don't match original code. If problems still occur, add bug reports with details.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script_v5.cpp
Modified: scummvm/trunk/engines/scumm/script_v5.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v5.cpp	2006-02-28 00:49:54 UTC (rev 20966)
+++ scummvm/trunk/engines/scumm/script_v5.cpp	2006-02-28 01:14:02 UTC (rev 20967)
@@ -466,15 +466,7 @@
 			a->setPalette(i, j);
 			break;
 		case 12:		// SO_TALK_COLOR
-
-			// Zak256 (and possibly other games) uses actor 0 to
-			// indicate that it's the default talk color that is
-			// to be changed.
-
-			if (act == 0)
-				_string[0].color = getVarOrDirectByte(PARAM_1);
-			else
-				a->_talkColor = getVarOrDirectByte(PARAM_1);
+			a->_talkColor = getVarOrDirectByte(PARAM_1);
 			break;
 		case 13:		// SO_ACTOR_NAME
 			loadPtrToResource(rtActorName, a->_number, NULL);
@@ -1315,12 +1307,7 @@
 
 	while ((_opcode = fetchScriptByte()) != 0xFF) {
 		cls = getVarOrDirectWord(PARAM_1);
-
-		if (!cls) // FIXME: Ender can't remember why this is here,
-			b = false;  // but it fixes an oddball zak256 crash
-		else
-			b = getClass(act, cls);
-
+		b = getClass(act, cls);
 		if (cls & 0x80 && !b || !(cls & 0x80) && b)
 			cond = false;
 	}