[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.78,2.79 script_v72he.cpp,2.214,2.215 script_v7he.cpp,2.131,2.132 script_v90he.cpp,2.177,2.178 sound.cpp,1.424,1.425

kirben kirben at users.sourceforge.net
Mon Mar 7 19:52:37 CET 2005


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

Modified Files:
	script_v100he.cpp script_v72he.cpp script_v7he.cpp 
	script_v90he.cpp sound.cpp 
Log Message:

Add HE100 difference in opcode.


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.78
retrieving revision 2.79
diff -u -d -r2.78 -r2.79
--- script_v100he.cpp	7 Mar 2005 06:37:55 -0000	2.78
+++ script_v100he.cpp	8 Mar 2005 03:52:02 -0000	2.79
@@ -244,7 +244,7 @@
 		OPCODE(o90_atan2),
 		OPCODE(o90_getSegmentAngle),
 		OPCODE(o90_getActorAnimProgress),
-		OPCODE(o6_invalid),
+		OPCODE(o90_getDistanceBetweenPoints),
 		/* A4 */
 		OPCODE(o6_ifClassOfIs),
 		OPCODE(o6_invalid),

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.214
retrieving revision 2.215
diff -u -d -r2.214 -r2.215
--- script_v72he.cpp	7 Mar 2005 06:37:56 -0000	2.214
+++ script_v72he.cpp	8 Mar 2005 03:52:02 -0000	2.215
@@ -634,7 +634,7 @@
 
 	// Filter out pointless trace messages, which often flood
 	if (strcmp((char *)_stringBuffer, "no trace") && strcmp((char *)_stringBuffer, "trace on"))
-		debug(0,"o72_addMessageToStack(\"%s\")", _scriptPointer);
+		debug(1,"o72_addMessageToStack(\"%s\")", _scriptPointer);
 
 	_scriptPointer += _stringLength;
 }

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.131
retrieving revision 2.132
diff -u -d -r2.131 -r2.132
--- script_v7he.cpp	3 Mar 2005 04:54:23 -0000	2.131
+++ script_v7he.cpp	8 Mar 2005 03:52:02 -0000	2.132
@@ -526,7 +526,7 @@
 		break;
 
 	case 255:
-		debug(0, "o70_startSound (ID %d, Offset %d, Channel %d, Flags %d)", _heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags);
+		debug(1, "o70_startSound (ID %d, Offset %d, Channel %d, Flags %d)", _heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags);
 		_sound->addSoundToQueue(_heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags);
 		_heSndFlags = 0;
 		break;

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.177
retrieving revision 2.178
diff -u -d -r2.177 -r2.178
--- script_v90he.cpp	7 Mar 2005 10:21:23 -0000	2.177
+++ script_v90he.cpp	8 Mar 2005 03:52:02 -0000	2.178
@@ -664,6 +664,7 @@
 	int x1, y1, z1, x2, y2, z2, dx, dy, dz, d;
 
 	switch (subOp) {
+	case 23: // HE100
 	case 28:
 		y2 = pop();
 		x2 = pop();
@@ -678,6 +679,7 @@
 			push((int)sqrt((double)(d + 1)));
 		}
 		break;
+	case 24: // HE100
 	case 29:
 		z2 = pop();
 		y2 = pop();
@@ -708,7 +710,7 @@
 	byte subOp = fetchScriptByte();
 	subOp -= 30;
 
-	debug(1,"o90_getSpriteInfo (%d)", subOp);
+	debug(0,"o90_getSpriteInfo (%d)", subOp);
 	switch (subOp) {
 	case 0:
 		spriteId = pop();
@@ -967,7 +969,7 @@
 	byte subOp = fetchScriptByte();
 	subOp -= 34;
 
-	debug(1,"o90_setSpriteInfo (%d)", subOp);
+	debug(0,"o90_setSpriteInfo (%d)", subOp);
 	switch (subOp) {
 	case 0:
 		args[0] = pop();
@@ -1300,7 +1302,7 @@
 
 	byte subOp = fetchScriptByte();
 
-	debug(1,"o90_getSpriteGroupInfo (%d)", subOp);
+	debug(0,"o90_getSpriteGroupInfo (%d)", subOp);
 	switch (subOp) {
 	case 8: // HE 99+
 		spriteGroupId = pop();
@@ -1382,7 +1384,7 @@
 	byte subOp = fetchScriptByte();
 	subOp -= 37;
 
-	debug(1,"o90_setSpriteGroupInfo (%d)", subOp);
+	debug(0,"o90_setSpriteGroupInfo (%d)", subOp);
 	switch (subOp) {
 	case 0:
 		type = pop() - 1;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -d -r1.424 -r1.425
--- sound.cpp	15 Feb 2005 10:32:55 -0000	1.424
+++ sound.cpp	8 Mar 2005 03:52:02 -0000	1.425
@@ -167,7 +167,7 @@
 	byte flags = SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE;
 
 	if (_vm->_heversion >= 70 && soundID > _vm->_numSounds) {
-		debug(0, "playSound #%d", soundID);
+		debug(1, "playSound #%d", soundID);
 
 		int music_offs, total_size;
 		uint tracks, skip = 0;





More information about the Scummvm-git-logs mailing list