[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.112,1.113 script_v2.cpp,2.238,2.239

[Travis Howell]

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

Modified Files:
	akos.cpp script_v2.cpp 
Log Message:

Add back HE sound differences for AKOS.
Remove old define
Avoid crash if using demo script in maniac (Enchanced)


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- akos.cpp	2 Mar 2004 21:55:14 -0000	1.112
+++ akos.cpp	3 Mar 2004 08:17:21 -0000	1.113
@@ -1217,7 +1217,10 @@
 			a->flip = GW(2) != 0;
 			continue;
 		case AKC_CmdQue3:
-			tmp = GB(2) - 1;
+			if (_features & GF_HUMONGOUS)
+				tmp = GB(2);
+			else
+				tmp = GB(2) - 1;
 			if ((uint) tmp < 8)
 				akos_queCommand(3, a, a->sound[tmp], 0);
 			continue;
@@ -1240,6 +1243,8 @@
 			akos_queCommand(5, a, GB(2), 0);
 			continue;
 		case AKC_SoundStuff:
+			if (_features & GF_HUMONGOUS)
+				continue;
 			tmp = GB(2) - 1;
 			if (tmp >= 8)
 				continue;

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.238
retrieving revision 2.239
diff -u -d -r2.238 -r2.239
--- script_v2.cpp	3 Mar 2004 03:14:22 -0000	2.238
+++ script_v2.cpp	3 Mar 2004 08:17:21 -0000	2.239
@@ -771,6 +771,10 @@
 	if ((opcode & 0x0f) == 0 || type == rtNumTypes)
 		return;
 
+	// HACK V2 Maniac Mansion tries to load an invalid sound resource in demo script.
+	if (_gameId == GID_MANIAC && _version == 2 && vm.slot[_currentScript].number == 9 && type == rtSound && resid == 1)
+		return;
+
 	if ((opcode & 0x0f) == 1) {
 		ensureResourceLoaded(type, resid);
 	} else {
@@ -1092,10 +1096,6 @@
 	a->putActor(x, y, a->room);
 }
 
-#ifndef BYPASS_COPY_PROT
-#define BYPASS_COPY_PROT
-#endif
-
 void ScummEngine_v2::o2_startScript() {
 	int script = getVarOrDirectByte(PARAM_1);