[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.114,2.115 script_v72he.cpp,2.78,2.79 script_v7he.cpp,2.71,2.72 script_v90he.cpp,2.24,2.25

[Travis Howell]

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

Modified Files:
	script_v6he.cpp script_v72he.cpp script_v7he.cpp 
	script_v90he.cpp 
Log Message:

Add some change to start later HE99 hames.


Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.114
retrieving revision 2.115
diff -u -d -r2.114 -r2.115
--- script_v6he.cpp	11 Sep 2004 03:02:37 -0000	2.114
+++ script_v6he.cpp	12 Sep 2004 02:25:12 -0000	2.115
@@ -807,7 +807,6 @@
 		break;
 	default:
 		error("o6_kernelSetFunctions: default case %d (param count %d)", args[0], num);
-		break;
 	}
 }
 

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.78
retrieving revision 2.79
diff -u -d -r2.78 -r2.79
--- script_v72he.cpp	12 Sep 2004 01:12:06 -0000	2.78
+++ script_v72he.cpp	12 Sep 2004 02:25:12 -0000	2.79
@@ -551,6 +551,15 @@
 		len = copyScriptString(string);
 	}
 
+	// The boot script in some HE games just set data file name
+	// to a bunch to spaces for some odd reason.
+	// We work around that.
+	if (!strcmp((char *)string,"%s.he3")) {
+		memset(string, 0, sizeof(string));
+		sprintf((char *)string, "%s.he3", _gameName.c_str());
+		len = resStrLen(string);
+	}
+
 	while (len--) {
 		chr = string[num++];
 		if (chr == 0x25) {
@@ -867,7 +876,7 @@
 		_actorClipOverride.top = pop();
 		_actorClipOverride.left = pop();
 		break;
-	case 65: // HE 90+
+	case 65: // HE 98+
 		i = pop();
 		j = pop();
 		debug(1,"o72_actorOps: case 65 (%d, %d)", i, j);

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.71
retrieving revision 2.72
diff -u -d -r2.71 -r2.72
--- script_v7he.cpp	11 Sep 2004 00:49:22 -0000	2.71
+++ script_v7he.cpp	12 Sep 2004 02:25:12 -0000	2.72
@@ -801,9 +801,10 @@
 		a = derefActor(args[1], "o7_kernelSetFunctions: 30");
 		a->clipOverride.bottom = args[2];
 		break;
-	default:
-		error("o6_kernelSetFunctions: default case %d (param count %d)", args[0], num);
+	case 714:
 		break;
+	default:
+		error("o7_kernelSetFunctions: default case %d (param count %d)", args[0], num);
 	}
 }
 

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.24
retrieving revision 2.25
diff -u -d -r2.24 -r2.25
--- script_v90he.cpp	12 Sep 2004 00:48:16 -0000	2.24
+++ script_v90he.cpp	12 Sep 2004 02:25:12 -0000	2.25
@@ -641,6 +641,9 @@
 		case 48:
 			pop();
 			break;
+		case 52: // HE 98+
+			pop();
+			break;
 		case 64:
 			pop();
 			break;