[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.65,1.66 script_v1.cpp,1.109,1.110

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv3482

Modified Files:
	actor.cpp script_v1.cpp 
Log Message:
fix some warnings, odd code, and prevent Simon segfaulting when wrong game specified.



Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- actor.cpp	14 May 2002 19:11:20 -0000	1.65
+++ actor.cpp	14 May 2002 19:44:40 -0000	1.66
@@ -1306,7 +1306,7 @@
 	curpal = _currentPalette + from * 3;
 	num = to - from + 1;
 	do {
-		*table++ = remapPaletteColor(curpal[0] * rfact >> 8,
+		*table++ = remapPaletteColor((curpal[0] * rfact) >> 8,
 																 curpal[1] * gfact >> 8,
 																 curpal[2] * bfact >> 8, (uint) - 1);
 		curpal += 3;

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- script_v1.cpp	14 May 2002 19:11:20 -0000	1.109
+++ script_v1.cpp	14 May 2002 19:44:41 -0000	1.110
@@ -1445,7 +1445,7 @@
 
 void Scumm::o5_ifClassOfIs()
 {
-	int act, cls, b;
+	int act, cls, b = 0;
 	bool cond = true;
 
 	act = getVarOrDirectWord(0x80);
@@ -1454,6 +1454,8 @@
 		cls = getVarOrDirectWord(0x80);
 		if (cls)
 			b = getClass(act, cls);
+		else
+			error("FIXME! Ender forgot why he added this.");
 
 		if (cls & 0x80 && !b || !(cls & 0x80) && b)
 			cond = false;
@@ -1984,6 +1986,7 @@
 		_opcode = fetchScriptByte();
 		e = getVarOrDirectByte(0x40);
 		setScaleItem(e - 1, b, a, d, c);
+		break;
 	case 8:											/* room scale? */
 		if (_features & GF_SMALL_HEADER) {
 			if (!(_features & GF_OLD256)) {