[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.147,2.148 script_v72he.cpp,2.281,2.282 script_v90he.cpp,2.245,2.246 wiz_he.cpp,2.75,2.76

[kirben]

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

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

Additions for funshop titles.


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.147
retrieving revision 2.148
diff -u -d -r2.147 -r2.148
--- script_v100he.cpp	7 May 2005 08:10:23 -0000	2.147
+++ script_v100he.cpp	7 May 2005 11:07:35 -0000	2.148
@@ -2348,6 +2348,7 @@
 }
 
 void ScummEngine_v100he::o100_getWizData() {
+	byte filename[4096];
 	int state, resId;
 	int32 w, h;
 	int16 x, y;
@@ -2407,6 +2408,7 @@
 		break;
 	case 111:
 		pop();
+		copyScriptString(filename, sizeof(filename));
 		pop();
 		push(0);
 		warning("o100_getWizData() case 111 unhandled");

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.281
retrieving revision 2.282
diff -u -d -r2.281 -r2.282
--- script_v72he.cpp	7 May 2005 07:57:57 -0000	2.281
+++ script_v72he.cpp	7 May 2005 11:07:37 -0000	2.282
@@ -1742,7 +1742,7 @@
 	debug(0,"Final filename to %s", filename + r);
 
 	slot = -1;
-	for (i = 0; i < 17; i++) {
+	for (i = 1; i < 17; i++) {
 		if (_hFileTable[i].isOpen() == false) {
 			slot = i;
 			break;

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.245
retrieving revision 2.246
diff -u -d -r2.245 -r2.246
--- script_v90he.cpp	7 May 2005 07:57:59 -0000	2.245
+++ script_v90he.cpp	7 May 2005 11:07:42 -0000	2.246
@@ -733,11 +733,36 @@
 		_wizParams.processFlags |= kWPFDstResNum;
 		_wizParams.dstResNum = pop();
 		break;
+	case 93: // HE99+
+		_wizParams.processFlags |= 0x100000;
+		_wizParams.field_180 = pop();
+		_wizParams.field_184 = pop();
+		break;
+	case 95: // HE99+
+		_wizParams.processMode = 13;
+		break;
+	case 96: // HE99+
+		_wizParams.field_239D = pop();
+		_wizParams.field_2399 = pop();
+		_wizParams.field_23A5 = pop();
+		_wizParams.field_23A1 = pop();
+		copyScriptString(_wizParams.string2, sizeof(_wizParams.string2));
+		_wizParams.processMode = 15;
+		break;
+	case 97: // HE99+
+		_wizParams.processMode = 16;
+		_wizParams.field_23AD = pop();
+		_wizParams.field_23A9 = pop();
+		copyScriptString(_wizParams.string1, sizeof(_wizParams.string1));
+		break;
 	case 108:
 		_wizParams.processFlags |= kWPFSetPos;
 		_wizParams.img.y1 = pop();
 		_wizParams.img.x1 = pop();
 		break;
+	case 150: // HE99+
+		_wizParams.processMode = 14;
+		break;
 	case 171: // HE99+
 		_wizParams.processMode = 8;
 		break;
@@ -1625,6 +1650,7 @@
 }
 
 void ScummEngine_v90he::o90_getWizData() {
+	byte filename[4096];
 	int state, resId;
 	int32 w, h;
 	int16 x, y;
@@ -1694,6 +1720,13 @@
 		pop();
 		push(0);
 		break;		
+	case 111:
+		pop();
+		copyScriptString(filename, sizeof(filename));
+		pop();
+		push(0);
+		warning("o90_getWizData() case 111 unhandled");
+		break;
 	default:
 		error("o90_getWizData: Unknown case %d", subOp);
 	}

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.75
retrieving revision 2.76
diff -u -d -r2.75 -r2.76
--- wiz_he.cpp	7 May 2005 07:57:59 -0000	2.75
+++ wiz_he.cpp	7 May 2005 11:07:45 -0000	2.76
@@ -1818,6 +1818,18 @@
 	case 10:
 		fillWizParallelogram(params);
 		break;
+	case 13:
+		// Used in SamsFunShop
+		// Start font
+		break;
+	case 14:
+		// Used in SamsFunShop
+		// End font
+		break;
+	case 15:
+		// Used in SamsFunShop
+		// Create font
+		break;
 	default:
 		error("Unhandled processWizImage mode %d", params->processMode);
 	}