[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.533,2.534 script_v100he.cpp,2.176,2.177 script_v72he.cpp,2.309,2.310 script_v80he.cpp,2.126,2.127 script_v90he.cpp,2.283,2.284

[kirben]

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

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

Add missing opcode in HE100 table.
Rename opcode.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.533
retrieving revision 2.534
diff -u -d -r2.533 -r2.534
--- intern.h	19 Oct 2005 08:44:13 -0000	2.533
+++ intern.h	19 Oct 2005 09:43:13 -0000	2.534
@@ -1009,7 +1009,7 @@
 	void o72_captureWizImage();
 	void o72_getTimer();
 	void o72_setTimer();
-	void o72_getSoundElapsedTime();
+	void o72_getSoundPosition();
 	void o72_startScript();
 	void o72_startObject();
 	void o72_drawObject();

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.176
retrieving revision 2.177
diff -u -d -r2.176 -r2.177
--- script_v100he.cpp	19 Oct 2005 08:45:08 -0000	2.176
+++ script_v100he.cpp	19 Oct 2005 09:43:13 -0000	2.177
@@ -59,7 +59,7 @@
 		OPCODE(o6_loadRoom),
 		OPCODE(o6_panCameraTo),
 		/* 10 */
-		OPCODE(o6_invalid),
+		OPCODE(o72_captureWizImage),
 		OPCODE(o100_jumpToScript),
 		OPCODE(o6_setClass),
 		OPCODE(o60_closeFile),
@@ -309,7 +309,7 @@
 		OPCODE(o6_isScriptRunning),
 		OPCODE(o90_sin),
 		/* D8 */
-		OPCODE(o72_getSoundElapsedTime),
+		OPCODE(o72_getSoundPosition),
 		OPCODE(o6_isSoundRunning),
 		OPCODE(o80_getSoundVar),
 		OPCODE(o100_getSpriteInfo),

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.309
retrieving revision 2.310
diff -u -d -r2.309 -r2.310
--- script_v72he.cpp	18 Oct 2005 19:16:02 -0000	2.309
+++ script_v72he.cpp	19 Oct 2005 09:43:13 -0000	2.310
@@ -156,7 +156,7 @@
 		/* 58 */
 		OPCODE(o72_getTimer),
 		OPCODE(o72_setTimer),
-		OPCODE(o72_getSoundElapsedTime),
+		OPCODE(o72_getSoundPosition),
 		OPCODE(o6_wordArrayDec),
 		/* 5C */
 		OPCODE(o6_if),
@@ -886,10 +886,10 @@
 	}
 }
 
-void ScummEngine_v72he::o72_getSoundElapsedTime() {
+void ScummEngine_v72he::o72_getSoundPosition() {
 	int snd = pop();
 	push(_sound->getSoundElapsedTime(snd) * 10);
-	debug(1,"o72_getSoundElapsedTime (%d)", snd);
+	debug(1,"o72_getSoundPosition (%d)", snd);
 }
 
 void ScummEngine_v72he::o72_startScript() {

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.126
retrieving revision 2.127
diff -u -d -r2.126 -r2.127
--- script_v80he.cpp	18 Oct 2005 01:30:21 -0000	2.126
+++ script_v80he.cpp	19 Oct 2005 09:43:13 -0000	2.127
@@ -155,7 +155,7 @@
 		/* 58 */
 		OPCODE(o72_getTimer),
 		OPCODE(o72_setTimer),
-		OPCODE(o72_getSoundElapsedTime),
+		OPCODE(o72_getSoundPosition),
 		OPCODE(o6_wordArrayDec),
 		/* 5C */
 		OPCODE(o6_if),

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.283
retrieving revision 2.284
diff -u -d -r2.283 -r2.284
--- script_v90he.cpp	18 Oct 2005 19:17:21 -0000	2.283
+++ script_v90he.cpp	19 Oct 2005 09:43:13 -0000	2.284
@@ -152,7 +152,7 @@
 		/* 58 */
 		OPCODE(o72_getTimer),
 		OPCODE(o72_setTimer),
-		OPCODE(o72_getSoundElapsedTime),
+		OPCODE(o72_getSoundPosition),
 		OPCODE(o6_wordArrayDec),
 		/* 5C */
 		OPCODE(o6_if),