[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.224,2.225 sound.cpp,1.385,1.386 script_v90he.cpp,2.6,2.7

[Travis Howell]

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

Modified Files:
	intern.h sound.cpp script_v90he.cpp 
Log Message:

stubs


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.224
retrieving revision 2.225
diff -u -d -r2.224 -r2.225
--- intern.h	6 Sep 2004 03:26:46 -0000	2.224
+++ intern.h	6 Sep 2004 08:53:18 -0000	2.225
@@ -805,6 +805,7 @@
 	void o90_unknown1C();
 	void o90_unknown25();
 	void o90_unknown26();
+	void o90_unknown27();
 	void o90_unknown28();
 };
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -d -r1.385 -r1.386
--- sound.cpp	6 Sep 2004 07:54:26 -0000	1.385
+++ sound.cpp	6 Sep 2004 08:53:19 -0000	1.386
@@ -661,7 +661,6 @@
 			}
 
 			size = b - 40 - extra ;
-			printf("size %d extra %d\n", size, extra);
 			sound = (byte *)malloc(size);
 			_sfxFile->read(sound, size);
 			_vm->_mixer->playRaw(handle, sound, size, 11000, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -d -r2.6 -r2.7
--- script_v90he.cpp	6 Sep 2004 07:06:11 -0000	2.6
+++ script_v90he.cpp	6 Sep 2004 08:53:19 -0000	2.7
@@ -93,7 +93,7 @@
 		OPCODE(o6_invalid),
 		OPCODE(o90_unknown25),
 		OPCODE(o90_unknown26),
-		OPCODE(o6_invalid),
+		OPCODE(o90_unknown27),
 		/* 28 */
 		OPCODE(o90_unknown28),
 		OPCODE(o6_invalid),
@@ -381,29 +381,79 @@
 void ScummEngine_v90he::o90_unknown1C() {
 	// For Pajame Sam 2 demo
 	// Incomplete
-	int value = fetchScriptByte();
-	value -= 46;
+	int subOp = fetchScriptByte();
+	subOp -= 46;
 
-	if (value == 10) {
-		int flags = pop();
-		pop();
-		int y1 = pop();
-		int x1 = pop();
-		int resnum = pop();
-		if (_fullRedraw) {
-			assert(_wizImagesNum < ARRAYSIZE(_wizImages));
-			WizImage *pwi = &_wizImages[_wizImagesNum];
-			pwi->resnum = resnum;
-			pwi->x1 = x1;
-			pwi->y1 = y1;
-			pwi->flags = flags;
-			++_wizImagesNum;
-		} else {
-			drawWizImage(rtImage, resnum, x1, y1, flags);
+	switch (subOp) {
+		case 0:
+			pop();
+			break;
+		case 1:
+			pop();
+			pop();
+			pop();
+			pop();
+			break;
+		case 2:
+			//Sets a variable to 1
+			break;
+		case 3:
+			//Gets a script string
+			break;
+		case 4:
+			//Gets a script string
+			pop();
+			break;
+		case 5:
+			pop();
+			pop();
+			pop();
+			pop();
+			pop();
+			break;
+		case 6:
+			pop();
+			break;
+		case 7:
+			pop();
+			break;
+		case 8:
+			pop();
+			break;
+		case 10:
+		{
+			int flags = pop();
+			pop();
+			int y1 = pop();
+			int x1 = pop();
+			int resnum = pop();
+			if (_fullRedraw) {
+				assert(_wizImagesNum < ARRAYSIZE(_wizImages));
+				WizImage *pwi = &_wizImages[_wizImagesNum];
+				pwi->resnum = resnum;
+				pwi->x1 = x1;
+				pwi->y1 = y1;
+				pwi->flags = flags;
+				++_wizImagesNum;
+			} else {
+				drawWizImage(rtImage, resnum, x1, y1, flags);
+			}
 		}
+			break;
+		case 11:
+			pop();
+			break;
+		case 19:
+			pop();
+			pop();
+			break;
+		case 209:
+			break;
+		default:
+			warning("o90_unknown1C: unhandled case %d", subOp);
 	}
 
-	debug(1,"o90_unknown1C stub (%d)", value);
+	debug(1,"o90_unknown1C stub (%d)", subOp);
 }
 
 void ScummEngine_v90he::o90_unknown25() {
@@ -468,6 +518,26 @@
 	debug(1,"o90_unknown26 stub (%d)", value);
 }
 
+void ScummEngine_v90he::o90_unknown27() {
+	int subOp = fetchScriptByte();
+	switch (subOp) {
+		case 30:
+			pop();
+			break;
+		case 31:
+			pop();
+			break;
+		case 43:
+			pop();
+			break;
+		default:
+			error("o90_unknown27: Unknown case %d", subOp);
+	}
+	push(0);
+
+	debug(1,"o90_unknown27 stub (%d)", subOp);
+}
+
 void ScummEngine_v90he::o90_unknown28() {
 	// Incomplete
 	int value = fetchScriptByte();