[Scummvm-cvs-logs] SF.net SVN: scummvm: [21211] scummvm/trunk/engines/scumm

kirben at users.sourceforge.net kirben at users.sourceforge.net
Fri Mar 10 15:10:03 CET 2006


Revision: 21211
Author:   kirben
Date:     2006-03-10 15:09:27 -0800 (Fri, 10 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21211&view=rev

Log Message:
-----------
o6_setObjectName is never used by HE72+ games

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/script_v100he.cpp
    scummvm/trunk/engines/scumm/he/script_v72he.cpp
    scummvm/trunk/engines/scumm/he/script_v80he.cpp
    scummvm/trunk/engines/scumm/he/script_v90he.cpp
    scummvm/trunk/engines/scumm/script_v6.cpp
Modified: scummvm/trunk/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v100he.cpp	2006-03-10 19:36:28 UTC (rev 21210)
+++ scummvm/trunk/engines/scumm/he/script_v100he.cpp	2006-03-10 23:09:27 UTC (rev 21211)
@@ -133,7 +133,7 @@
 		OPCODE(o6_neq),
 		OPCODE(o100_dim2dim2Array),
 		/* 48 */
-		OPCODE(o6_setObjectName),
+		OPCODE(o6_invalid),
 		OPCODE(o100_redim2dimArray),
 		OPCODE(o6_not),
 		OPCODE(o6_invalid),

Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp	2006-03-10 19:36:28 UTC (rev 21210)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp	2006-03-10 23:09:27 UTC (rev 21211)
@@ -234,7 +234,7 @@
 		OPCODE(o6_getVerbFromXY),
 		OPCODE(o6_beginOverride),
 		OPCODE(o6_endOverride),
-		OPCODE(o6_setObjectName),
+		OPCODE(o6_invalid),
 		/* 98 */
 		OPCODE(o6_isSoundRunning),
 		OPCODE(o6_setBoxFlags),
@@ -2324,9 +2324,6 @@
 		_string[m].overhead = true;
 		_string[m].no_talk_anim = false;
 		break;
-	case 73:		// SO_SAY_VOICE
-		error("decodeParseString: case 73");
-		break;
 	case 74:		// SO_MUMBLE
 		_string[m].no_talk_anim = true;
 		break;

Modified: scummvm/trunk/engines/scumm/he/script_v80he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v80he.cpp	2006-03-10 19:36:28 UTC (rev 21210)
+++ scummvm/trunk/engines/scumm/he/script_v80he.cpp	2006-03-10 23:09:27 UTC (rev 21211)
@@ -231,7 +231,7 @@
 		OPCODE(o6_invalid),
 		OPCODE(o6_beginOverride),
 		OPCODE(o6_endOverride),
-		OPCODE(o6_setObjectName),
+		OPCODE(o6_invalid),
 		/* 98 */
 		OPCODE(o6_isSoundRunning),
 		OPCODE(o6_setBoxFlags),

Modified: scummvm/trunk/engines/scumm/he/script_v90he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v90he.cpp	2006-03-10 19:36:28 UTC (rev 21210)
+++ scummvm/trunk/engines/scumm/he/script_v90he.cpp	2006-03-10 23:09:27 UTC (rev 21211)
@@ -230,7 +230,7 @@
 		OPCODE(o90_getPaletteData),
 		OPCODE(o6_beginOverride),
 		OPCODE(o6_endOverride),
-		OPCODE(o6_setObjectName),
+		OPCODE(o6_invalid),
 		/* 98 */
 		OPCODE(o6_isSoundRunning),
 		OPCODE(o6_setBoxFlags),

Modified: scummvm/trunk/engines/scumm/script_v6.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v6.cpp	2006-03-10 19:36:28 UTC (rev 21210)
+++ scummvm/trunk/engines/scumm/script_v6.cpp	2006-03-10 23:09:27 UTC (rev 21211)
@@ -3154,9 +3154,6 @@
 		_string[m].overhead = true;
 		_string[m].no_talk_anim = false;
 		break;
-	case 73:		// SO_SAY_VOICE
-		error("decodeParseString: case 73");
-		break;
 	case 74:		// SO_MUMBLE
 		_string[m].no_talk_anim = true;
 		break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list