[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.107.2.4,1.107.2.5

[Travis Howell]

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

Modified Files:
      Tag: branch-0-6-0
	akos.cpp 
Log Message:

Back port some akos sound fixes.


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.107.2.4
retrieving revision 1.107.2.5
diff -u -d -r1.107.2.4 -r1.107.2.5
--- akos.cpp	2 May 2004 16:36:03 -0000	1.107.2.4
+++ akos.cpp	3 May 2004 11:37:16 -0000	1.107.2.5
@@ -1224,18 +1224,14 @@
 			a->flip = GW(2) != 0;
 			continue;
 		case AKC_CmdQue3:
-			// FIXME/TODO this is exception fot FT game for missing "half" footsteps
-			// see bug #886201
-			// this fix/hack was introduced a long time ago
-			if (_gameId == GID_FT)
-				tmp = GB(2) - 1;
-			else
+			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;
 		case AKC_CmdQue3Quick:
-//			akos_queCommand(3, a, a->sound[1], 0);	//previous
 			akos_queCommand(3, a, a->sound[0], 0);
 			continue;
 		case AKC_StartAnim:
@@ -1254,7 +1250,7 @@
 			akos_queCommand(5, a, GB(2), 0);
 			continue;
 		case AKC_SoundStuff:
-			tmp = GB(2);
+			tmp = GB(2) - 1;
 			if (tmp >= 8)
 				continue;
 			tmp2 = GB(4);
@@ -1345,7 +1341,6 @@
 		break;
 	case 4:
 		a->startAnimActor(param_1);
-		// param_2 ?
 		break;
 	case 5:
 		a->forceClip = param_1;