[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.143,1.144 script_v8.cpp,2.173,2.174

[Max Horn]

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

Modified Files:
	script_v6.cpp script_v8.cpp 
Log Message:
cleanup

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- script_v6.cpp	31 May 2003 20:45:41 -0000	1.143
+++ script_v6.cpp	31 May 2003 21:25:13 -0000	1.144
@@ -2042,10 +2042,8 @@
 		offs = fetchScriptWordSigned();
 		actnum = pop();
 		a = derefActor(actnum, "o6_wait:168");
-		if (a->isInCurrentRoom() && a->moving) {
-			_scriptPointer += offs;
-			o6_breakHere();
-		}
+		if (a->isInCurrentRoom() && a->moving)
+			break;
 		return;
 	case 169:
 		// HACK: For Conroy Bumpus' song in Sam & Max.
@@ -2085,10 +2083,8 @@
 		offs = fetchScriptWordSigned();
 		actnum = pop();
 		a = derefActor(actnum, "o6_wait:226");
-		if (a->isInCurrentRoom() && a->needRedraw) {
-			_scriptPointer += offs;
-			o6_breakHere();
-		}
+		if (a->isInCurrentRoom() && a->needRedraw)
+			break;
 		return;
 	case 232:										/* wait until actor stops turning */
 		// FIXME: This opcode is really odd. It's used a lot in The Dig.
@@ -2107,10 +2103,8 @@
 			actnum = _curActor;
 		}
 		a = derefActor(actnum, "o6_wait:232b");
-		if (a->isInCurrentRoom() && a->moving & MF_TURN) {
-			_scriptPointer += offs;
-			o6_breakHere();
-		}
+		if (a->isInCurrentRoom() && a->moving & MF_TURN)
+			break;
 		return;
 	default:
 		error("o6_wait: default case 0x%x", subOp);

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.173
retrieving revision 2.174
diff -u -d -r2.173 -r2.174
--- script_v8.cpp	31 May 2003 17:18:41 -0000	2.173
+++ script_v8.cpp	31 May 2003 21:25:14 -0000	2.174
@@ -641,10 +641,8 @@
 		offs = fetchScriptWordSigned();
 		actnum = pop();
 		a = derefActor(actnum, "o8_wait:SO_WAIT_FOR_ACTOR");
-		if (a->moving) {
-			_scriptPointer += offs;
-			o6_breakHere();
-		}
+		if (a->isInCurrentRoom() && a->moving)
+			break;
 		return;
 	case 0x1F:		// SO_WAIT_FOR_MESSAGE Wait for message
 		if (VAR(VAR_HAVE_MSG))
@@ -667,19 +665,15 @@
 		offs = fetchScriptWordSigned();
 		actnum = pop();
 		a = derefActor(actnum, "o8_wait:SO_WAIT_FOR_ANIMATION");
-		if (a->isInCurrentRoom() && a->needRedraw) {
-			_scriptPointer += offs;
-			o6_breakHere();
-		}
+		if (a->isInCurrentRoom() && a->needRedraw)
+			break;
 		return;
 	case 0x23:		// SO_WAIT_FOR_TURN
 		offs = fetchScriptWordSigned();
 		actnum = pop();
 		a = derefActor(actnum, "o8_wait:SO_WAIT_FOR_TURN");
-		if (a->isInCurrentRoom() && a->moving & MF_TURN) {
-			_scriptPointer += offs;
-			o6_breakHere();
-		}
+		if (a->isInCurrentRoom() && a->moving & MF_TURN)
+			break;
 		return;
 	default:
 		error("o8_wait: default case 0x%x", subOp);