[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.185,1.186 script_v8.cpp,2.200,2.201

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31241

Modified Files:
	actor.cpp script_v8.cpp 
Log Message:
cleanup / some warnings (I'd like to know if and where those opcodes are used)

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- actor.cpp	7 Nov 2003 02:11:40 -0000	1.185
+++ actor.cpp	10 Nov 2003 00:28:09 -0000	1.186
@@ -1655,6 +1655,7 @@
 		MKLINE(Actor, room, sleByte, VER(8)),
 		MKLINE(Actor, talkColor, sleByte, VER(8)),
 		MKLINE(Actor, talkFrequency, sleInt16, VER(16)),
+//		MKLINE(Actor, talkPan, sleInt16, VER(???)),	// TODO: Add this next time savegame format is updated 
 		MKLINE(Actor, scalex, sleByte, VER(8)),
 		MKLINE(Actor, scaley, sleByte, VER(8)),
 		MKLINE(Actor, charset, sleByte, VER(8)),

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.200
retrieving revision 2.201
diff -u -d -r2.200 -r2.201
--- script_v8.cpp	9 Nov 2003 22:12:16 -0000	2.200
+++ script_v8.cpp	10 Nov 2003 00:28:09 -0000	2.201
@@ -1069,7 +1069,6 @@
 		a->talkFrequency = pop();
 		break;
 	case 0x89:		// SO_ACTOR_PAN
-		// FIXME: This should be stored in savegames.
 		// 0 = left, 64 = middle, 127 = right.
 		a->talkPan = pop();
 
@@ -1207,13 +1206,15 @@
 	case 0xA6:		// SO_VERB_CHARSET Choose charset for verb
 		// FIXME - TODO
 		vs->charset_nr = pop();
+		warning("SO_VERB_CHARSET %d: not yet implemented", vs->charset_nr);
 		break;
 	case 0xA7:		// SO_VERB_LINE_SPACING Choose linespacing for verb
 		// FIXME - TODO
 		// Note: it seems that var596 stores the "line spacing". It is used by various
 		// scripts that place verbs for that.
 		// Also, var595 contains the vertical position at which to start placing verbs (330)
-		pop();
+		a = pop();
+		warning("SO_VERB_CHARSET %d: not yet implemented", a);
 		break;
 	default:
 		error("o8_verbops: default case 0x%x", subOp);
@@ -1305,9 +1306,6 @@
 	case 23:	// setActorChoreLimbFrame
 		// FIXME: This is critical, and is the cause of the Cannon "too many scripts" crash
 		// This opcode is used a lot in script 28.
-		// The problem here is that args[4] is always 0, as it is computed from
-		// lipSyncWidth and lipSyncHeight, which we currently don't support. As a result,
-		// actors will currently not move their mouth at all!
 //		warning("o8_kernelSetFunctions: setActorChoreLimbFrame(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
 		a = derefActor(args[1], "o8_kernelSetFunctions:setActorChoreLimbFrame");