[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.75,2.76 script_v72he.cpp,2.212,2.213

kirben kirben at users.sourceforge.net
Sun Mar 6 20:21:49 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3404/scumm

Modified Files:
	script_v100he.cpp script_v72he.cpp 
Log Message:

Cases are different.


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.75
retrieving revision 2.76
diff -u -d -r2.75 -r2.76
--- script_v100he.cpp	4 Mar 2005 05:34:53 -0000	2.75
+++ script_v100he.cpp	7 Mar 2005 04:21:11 -0000	2.76
@@ -438,11 +438,10 @@
 		a->charset = pop();
 		break;
 	case 18:
-	case 128:
-		_actorClipOverride.bottom = pop();
-		_actorClipOverride.right = pop();
-		_actorClipOverride.top = pop();
-		_actorClipOverride.left = pop();
+		a->_clipOverride.bottom = pop();
+		a->_clipOverride.right = pop();
+		a->_clipOverride.top = pop();
+		a->_clipOverride.left = pop();
 		break;
 	case 22:
 		k = getStackList(args, ARRAYSIZE(args));
@@ -521,6 +520,12 @@
 	case 89:		// SO_NEVER_ZCLIP
 		a->forceClip = 0;
 		break;
+	case 128:
+		_actorClipOverride.bottom = pop();
+		_actorClipOverride.right = pop();
+		_actorClipOverride.top = pop();
+		_actorClipOverride.left = pop();
+		break;
 	case 130:		// SO_SOUND
 		k = getStackList(args, ARRAYSIZE(args));
 		for (i = 0; i < k; i++)

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.212
retrieving revision 2.213
diff -u -d -r2.212 -r2.213
--- script_v72he.cpp	3 Mar 2005 05:09:39 -0000	2.212
+++ script_v72he.cpp	7 Mar 2005 04:21:11 -0000	2.213
@@ -998,12 +998,17 @@
 		a->needRedraw = true;
 		break;
 	case 64:
-	case 67: // HE 99+
 		_actorClipOverride.bottom = pop();
 		_actorClipOverride.right = pop();
 		_actorClipOverride.top = pop();
 		_actorClipOverride.left = pop();
 		break;
+	case 67: // HE 99+
+		a->_clipOverride.bottom = pop();
+		a->_clipOverride.right = pop();
+		a->_clipOverride.top = pop();
+		a->_clipOverride.left = pop();
+		break;
 	case 65: // HE 98+
 		i = pop();
 		j = pop();





More information about the Scummvm-git-logs mailing list