[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.245,1.246

[kirben]

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

Modified Files:
	akos.cpp 
Log Message:

Add missing akos cases for pajama, fixes bug #1367793.


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- akos.cpp	5 Nov 2005 13:05:51 -0000	1.245
+++ akos.cpp	27 Nov 2005 23:22:42 -0000	1.246
@@ -1638,24 +1638,6 @@
 			if (akos_compare(a->getAnimVar(GB(4)), GW(2), code - AKC_SkipStart) == 0)
 				flag_value = true;
 			continue;
-		case AKC_C0A0:
-			akos_queCommand(8, a, GB(2), 0);
-			continue;
-		case AKC_C0A1:
-			if (a->_heTalking) {
-				curpos = GUW(2);
-				break;
-			}
-			continue;
-		case AKC_C0A2:
-			if (!a->_heTalking) {
-				curpos = GUW(2);
-				break;
-			}
-			continue;
-		case AKC_C0A3:
-			akos_queCommand(8, a, a->getAnimVar(GB(2)), 0);
-			continue;
 		case AKC_C016:
 			if (_sound->isSoundRunning( a->_sound[a->getAnimVar(GB(4))]))  {
 				curpos = GUW(2);
@@ -1683,23 +1665,48 @@
 		case AKC_C044:
 			akos_queCommand(3, a, a->_sound[a->getAnimVar(GB(2))], 0);
 			continue;
-
 		case AKC_C045:
 			a->setUserCondition(GB(3), a->getAnimVar(GB(4)));
 			continue;
-
 		case AKC_C046:
 			a->setAnimVar(GB(4), a->isUserConditionSet(GB(3)));
 			continue;
-
 		case AKC_C047:
 			a->setTalkCondition(GB(3));
 			continue;
-
 		case AKC_C048:
 			a->setAnimVar(GB(4), a->isTalkConditionSet(GB(3)));
 			continue;
-
+		case AKC_C0A0:
+			akos_queCommand(8, a, GB(2), 0);
+			continue;
+		case AKC_C0A1:
+			if (a->_heTalking != 0) {
+				curpos = GUW(2);
+				break;
+			}
+			continue;
+		case AKC_C0A2:
+			if (a->_heTalking == 0) {
+				curpos = GUW(2);
+				break;
+			}
+			continue;
+		case AKC_C0A3:
+			akos_queCommand(8, a, a->getAnimVar(GB(2)), 0);
+			continue;
+		case AKC_C0A4:
+			if (VAR(VAR_TALK_ACTOR) != 0) {
+				curpos = GUW(2);
+				break;
+			}
+			continue;
+		case AKC_C0A5:
+			if (VAR(VAR_TALK_ACTOR) == 0) {
+				curpos = GUW(2);
+				break;
+			}
+			continue;
 		default:
 			if ((code & 0xC000) == 0xC000)
 				error("Undefined uSweat token %X", code);