[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.250,2.251 script_v6he.cpp,2.115,2.116 script_v80he.cpp,2.20,2.21 script_v90he.cpp,2.32,2.33

Travis Howell kirben at users.sourceforge.net
Tue Sep 14 05:06:01 CEST 2004


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

Modified Files:
	intern.h script_v6he.cpp script_v80he.cpp script_v90he.cpp 
Log Message:

Add opcode


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.250
retrieving revision 2.251
diff -u -d -r2.250 -r2.251
--- intern.h	14 Sep 2004 07:59:40 -0000	2.250
+++ intern.h	14 Sep 2004 12:05:00 -0000	2.251
@@ -796,6 +796,7 @@
 	/* HE version 80 script opcodes */
 	void o80_unknown45();
 	void o80_unknown49();
+	void o80_unknown4A();
 	void o80_readConfigFile();
 	void o80_writeConfigFile();
 	void o80_cursorCommand();

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.115
retrieving revision 2.116
diff -u -d -r2.115 -r2.116
--- script_v6he.cpp	12 Sep 2004 02:25:12 -0000	2.115
+++ script_v6he.cpp	14 Sep 2004 12:05:00 -0000	2.116
@@ -1156,11 +1156,10 @@
 void ScummEngine_v6he::o6_localizeArray() {
 	int slot = pop();
 
-	if (slot < _numArray) {
-		_arraySlot[slot] = vm.slot[_currentScript].number;
-	} else {
-		warning("o6_localizeArray(%d): array slot out of range", slot);
-	}
+	if (slot >= _numArray)
+		error("o6_localizeArray(%d): array slot out of range", slot);
+
+	_arraySlot[slot] = vm.slot[_currentScript].number;
 }
 
 void ScummEngine_v6he::o6_seekFilePos() {

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.20
retrieving revision 2.21
diff -u -d -r2.20 -r2.21
--- script_v80he.cpp	14 Sep 2004 07:59:40 -0000	2.20
+++ script_v80he.cpp	14 Sep 2004 12:05:00 -0000	2.21
@@ -137,7 +137,7 @@
 		/* 48 */
 		OPCODE(o6_invalid),
 		OPCODE(o80_unknown49),
-		OPCODE(o6_invalid),
+		OPCODE(o80_unknown4A),
 		OPCODE(o72_wordArrayIndexedWrite),
 		/* 4C */
 		OPCODE(o6_invalid),
@@ -422,6 +422,15 @@
 	debug(1,"o80_unknown49 stub (%d, %d)", subOp, snd);
 }
 
+void ScummEngine_v80he::o80_unknown4A() {
+	int slot = pop();
+
+	if (slot >= _numArray)
+		error("o80_unknown4A(%d): array slot out of range", slot);
+
+	_arraySlot[slot] = -1;
+}
+
 void ScummEngine_v80he::o80_readConfigFile() {
 	byte name[128], section[128], filename[256];
 	int type, retval;

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.32
retrieving revision 2.33
diff -u -d -r2.32 -r2.33
--- script_v90he.cpp	14 Sep 2004 07:59:40 -0000	2.32
+++ script_v90he.cpp	14 Sep 2004 12:05:00 -0000	2.33
@@ -137,7 +137,7 @@
 		/* 48 */
 		OPCODE(o6_invalid),
 		OPCODE(o80_unknown49),
-		OPCODE(o6_invalid),
+		OPCODE(o80_unknown4A),
 		OPCODE(o72_wordArrayIndexedWrite),
 		/* 4C */
 		OPCODE(o6_invalid),





More information about the Scummvm-git-logs mailing list