[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.236.2.5,1.236.2.6 charset.cpp,2.154.2.2,2.154.2.3 string.cpp,1.304.2.2,1.304.2.3

[kirben]

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

Modified Files:
      Tag: branch-0-8-0
	akos.cpp charset.cpp string.cpp 
Log Message:

Backport Korean fixes.
Backport Pajama Sam akos fix.


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.236.2.5
retrieving revision 1.236.2.6
diff -u -d -r1.236.2.5 -r1.236.2.6
--- akos.cpp	28 Oct 2005 03:00:17 -0000	1.236.2.5
+++ akos.cpp	28 Nov 2005 00:22:48 -0000	1.236.2.6
@@ -1627,24 +1627,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);
@@ -1672,23 +1654,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);

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.154.2.2
retrieving revision 2.154.2.3
diff -u -d -r2.154.2.2 -r2.154.2.3
--- charset.cpp	8 Nov 2005 00:58:44 -0000	2.154.2.2
+++ charset.cpp	28 Nov 2005 00:22:49 -0000	2.154.2.3
@@ -156,7 +156,7 @@
 		else if (kanjiType == EKANJI) chunk = 144;
 		break;
 	default:
-		error("Invaild Char! f %x s %x base %x c %d p %d", f, s, base, c, p);
+		debug(4, "Invalid Char! f %x s %x base %x c %d p %d", f, s, base, c, p);
 		return 0;
 	}
 

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.304.2.2
retrieving revision 1.304.2.3
diff -u -d -r1.304.2.2 -r1.304.2.3
--- string.cpp	8 Nov 2005 00:49:33 -0000	1.304.2.2
+++ string.cpp	28 Nov 2005 00:22:49 -0000	1.304.2.3
@@ -937,6 +937,8 @@
 		for (i = 0; i < lineCount; i++) {
 			if (*ptr == '!') {
 				// Don't know what a line with '!' means, just ignore it
+			} else if (*ptr == 'h') {
+				// File contains Korean text (Hangul). just ignore it
 			} else if (*ptr == 'e') {
 				// File is encoded!
 				enc = 0x13;