[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.31,1.32 script_v6.cpp,1.1,1.2

[Max Horn]

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

Modified Files:
	saveload.cpp script_v6.cpp 
Log Message:
cleanup - we now know that the frame field in Actor is needed, we just have to figure out how to set it correctly

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- saveload.cpp	13 Dec 2002 03:23:16 -0000	1.31
+++ saveload.cpp	15 Dec 2002 17:28:46 -0000	1.32
@@ -263,7 +263,6 @@
 		MK_OBSOLETE(Actor, mask, sleByte, VER_V8, VER_V9),
 		MKLINE(Actor, shadow_mode, sleByte, VER_V8),
 		MKLINE(Actor, visible, sleByte, VER_V8),
-		// FIXME - frame is never set and thus always 0! See actor.h comment
 		MKLINE(Actor, frame, sleByte, VER_V8),
 		MKLINE(Actor, animSpeed, sleByte, VER_V8),
 		MKLINE(Actor, animProgress, sleByte, VER_V8),

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- script_v6.cpp	12 Dec 2002 16:29:20 -0000	1.1
+++ script_v6.cpp	15 Dec 2002 17:28:46 -0000	1.2
@@ -1737,9 +1737,6 @@
 	case 228:										/* walk script */
 		a->walk_script = pop();
 		break;
-	case 235:										/* talk_script */
-		a->talk_script = pop();
-		break;
 	case 229:										/* stand */
 		a->stopActorMoving();
 		a->startAnimActor(a->standFrame);
@@ -1757,6 +1754,9 @@
 	case 234:										/* unfreeze actor */
 		a->moving &= ~0x7f;
 		break;
+	case 235:										/* talk_script */
+		a->talk_script = pop();
+		break;
 	default:
 		error("o6_actorset: default case %d", b);
 	}
@@ -2080,7 +2080,6 @@
 			int actnum = pop();
 			Actor *a = derefActorSafe(actnum, "o6_wait:226");
 			int offs = (int16)fetchScriptWord();
-			
 			if (a && a->isInCurrentRoom() && a->needRedraw) {
 				_scriptPointer += offs;
 				o6_breakHere();
@@ -2088,7 +2087,9 @@
 			return;
 		}
 	case 232:{										/* wait until actor stops turning */
-			Actor *a = derefActorSafe(pop(), "o6_wait:226");
+			int actnum = pop();
+			Actor *a = derefActorSafe(actnum, "o6_wait:232");
+			printf("
 			int offs = (int16)fetchScriptWord();
 			if (a && a->isInCurrentRoom() && a->moving & MF_TURN) {
 				_scriptPointer += offs;
@@ -2788,7 +2789,7 @@
 		break;
 	case 212:
 		a = derefActorSafe(args[1], "o6_kernelFunction:212");
-		// FIXME - frame is never set and thus always 0! See actor.h comment
+		// This is used by walk scripts
 		push(a->frame);
 		break;
 	case 215: