[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.310,2.311 script_v100he.cpp,2.23,2.24 script_v7he.cpp,2.111,2.112 script_v80he.cpp,2.60,2.61 script_v90he.cpp,2.100,2.101 sound.cpp,1.402,1.403

Travis Howell kirben at users.sourceforge.net
Sat Oct 16 23:34:02 CEST 2004


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

Modified Files:
	intern.h script_v100he.cpp script_v7he.cpp script_v80he.cpp 
	script_v90he.cpp sound.cpp 
Log Message:

Rename opcode


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.310
retrieving revision 2.311
diff -u -d -r2.310 -r2.311
--- intern.h	17 Oct 2004 05:04:49 -0000	2.310
+++ intern.h	17 Oct 2004 06:32:58 -0000	2.311
@@ -802,7 +802,7 @@
 	/* HE version 80 script opcodes */
 	void o80_unknown45();
 	void o80_unknown48();
-	void o80_unknown49();
+	void o80_getSoundVar();
 	void o80_localizeArrayToRoom();
 	void o80_readConfigFile();
 	void o80_writeConfigFile();

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.23
retrieving revision 2.24
diff -u -d -r2.23 -r2.24
--- script_v100he.cpp	17 Oct 2004 04:35:36 -0000	2.23
+++ script_v100he.cpp	17 Oct 2004 06:32:58 -0000	2.24
@@ -316,7 +316,7 @@
 		/* D8 */
 		OPCODE(o72_unknown5A),
 		OPCODE(o6_isSoundRunning),
-		OPCODE(o80_unknown49),
+		OPCODE(o80_getSoundVar),
 		OPCODE(o100_unknown25),
 		/* DC */
 		OPCODE(o90_sqrt),

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.111
retrieving revision 2.112
diff -u -d -r2.111 -r2.112
--- script_v7he.cpp	17 Oct 2004 04:35:36 -0000	2.111
+++ script_v7he.cpp	17 Oct 2004 06:32:58 -0000	2.112
@@ -412,7 +412,12 @@
 		_heSndFlags |= 4;
 		break;
 	case 23:
-		debug(1,"o70_startSound: case 29 (%d, %d, %d)", pop(), pop(), pop());
+		{
+		int value = pop();
+		int var = pop();
+		int snd = pop();
+		debug(1,"o70_startSound: case 29 (snd %d, var %d, value %d)", snd, var, value);
+		}
 		break;
 	case 56:
 		_heSndFlags |= 2;

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.60
retrieving revision 2.61
diff -u -d -r2.60 -r2.61
--- script_v80he.cpp	16 Oct 2004 20:38:37 -0000	2.60
+++ script_v80he.cpp	17 Oct 2004 06:32:58 -0000	2.61
@@ -135,7 +135,7 @@
 		OPCODE(o6_wordArrayWrite),
 		/* 48 */
 		OPCODE(o80_unknown48),
-		OPCODE(o80_unknown49),
+		OPCODE(o80_getSoundVar),
 		OPCODE(o80_localizeArrayToRoom),
 		OPCODE(o6_wordArrayIndexedWrite),
 		/* 4C */
@@ -378,24 +378,22 @@
 }
 
 void ScummEngine_v80he::o80_unknown45() {
-	// Sound related
+	// Loads SBNG sound resource
 	byte subOp = fetchScriptByte();
 
 	switch (subOp) {
 	case 27:
 		pop();
+		//loadSBNG(_heSBNGId, pop();
 		break;
 	case 217:
+		//loadSBNG(_heSBNGId, -1);
 		break;
 	case 232:
-		_heSndSoundId = pop();
-		break;
-	case 255:
-		//Case doesn't match disasm.
-		_sound->addSoundToQueue(_heSndSoundId);
+		//_heSBNGId = pop();
 		break;
 	default:
-		warning("o80_unknown45: default type %d", subOp);
+		warning("o80_unknown45: default case %d", subOp);
 	}
 	debug(1,"o80_unknown45 stub (%d)",subOp);
 }
@@ -417,25 +415,14 @@
 	push(val);
 }
 
-void ScummEngine_v80he::o80_unknown49() {
-	// Sound related
-	int result = 0;
-	int subOp = pop();
+void ScummEngine_v80he::o80_getSoundVar() {
+	// Checks sound variable
+	int var = pop();
 	int snd = pop();
 
-	switch (subOp) {
-	case 0:
-		result = !_sound->isSoundRunning(snd);
-		break;
-	case 1:
-		result = _sound->isSoundRunning(snd); 
-		break;
-	default:
-		warning("o80_unknown49: default type %d", subOp);
-	}
-
-	push (result);
-	debug(1,"o80_unknown49 stub (%d, %d)", subOp, snd);
+	checkRange(27, 0, var, "Illegal sound variable %d");
+	push (_rnd.getRandomNumber(3));
+	debug(1,"o80_getSoundVar stub (snd %d, var %d)", snd, var);
 }
 
 void ScummEngine_v80he::o80_localizeArrayToRoom() {

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.100
retrieving revision 2.101
diff -u -d -r2.100 -r2.101
--- script_v90he.cpp	17 Oct 2004 05:04:49 -0000	2.100
+++ script_v90he.cpp	17 Oct 2004 06:32:58 -0000	2.101
@@ -135,7 +135,7 @@
 		OPCODE(o6_wordArrayWrite),
 		/* 48 */
 		OPCODE(o80_unknown48),
-		OPCODE(o80_unknown49),
+		OPCODE(o80_getSoundVar),
 		OPCODE(o80_localizeArrayToRoom),
 		OPCODE(o6_wordArrayIndexedWrite),
 		/* 4C */

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -d -r1.402 -r1.403
--- sound.cpp	13 Oct 2004 07:52:42 -0000	1.402
+++ sound.cpp	17 Oct 2004 06:32:58 -0000	1.403
@@ -270,6 +270,11 @@
 			ptr += 8 + READ_BE_UINT32(ptr + 12);
 		}
 
+		if (READ_UINT32(ptr) == MKID('SBNG')) {
+			ptr += READ_BE_UINT32(ptr + 4);
+			warning("playSound: Skipped SBNG block");
+		}
+
 		if (READ_UINT32(ptr) != MKID('SDAT')) {
 			warning("playSound: Invalid sound %d", soundID);
 			return;	// abort
@@ -663,6 +668,7 @@
 			_sfxFile->seek(offset + 32, SEEK_SET);
 
 			if (_sfxFile->readUint32LE() == TO_LE_32(MKID('SBNG'))) {
+				warning("startTalkSound: Skipped SBNG block");
 				// Skip the SBNG, so we end up at the SDAT chunk
 				extra = _sfxFile->readUint32BE();
 				_sfxFile->seek(extra - 4, SEEK_CUR);





More information about the Scummvm-git-logs mailing list