[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.101,2.102

Travis Howell kirben at users.sourceforge.net
Sat Aug 28 20:23:06 CEST 2004


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

Modified Files:
	charset.cpp 
Log Message:

Add HE 7.2 differences


Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.101
retrieving revision 2.102
diff -u -d -r2.101 -r2.102
--- charset.cpp	29 Aug 2004 00:15:36 -0000	2.101
+++ charset.cpp	29 Aug 2004 03:19:09 -0000	2.102
@@ -99,12 +99,24 @@
 	int width = 1;
 	byte chr;
 	int oldID = getCurID();
+	int code = (_vm->_gameId == GID_PAJAMA) ? 127 : 64;
 
 	while ((chr = text[pos++]) != 0) {
+		if (_vm->_heversion >= 72 && chr == code) {
+			chr = text[pos++];
+			if (chr == 84) {  // Strings of speech offset/size
+				while(chr != code)
+					chr = text[pos++];
+				continue;
+			}
+			if (chr == 119) // 'Wait'
+				break;
+			if (chr == 104|| chr == 110) // 'Newline'
+				break;
+		} else if (chr == '@')
+			continue;
 		if (chr == 0xD)
 			break;
-		if (chr == '@')
-			continue;
 		if (chr == 254 || chr == 255) {
 			chr = text[pos++];
 			if (chr == 3)	// 'WAIT'
@@ -142,9 +154,25 @@
 	int curw = 1;
 	byte chr;
 	int oldID = getCurID();
+	int code = (_vm->_gameId == GID_PAJAMA) ? 127 : 64;
 
 	while ((chr = str[pos++]) != 0) {
-		if (chr == '@')
+		if (_vm->_heversion >= 72 && chr == code) {
+			chr = str[pos++];
+			if (chr == 84) {  // Strings of speech offset/size
+				while(chr != code)
+					chr = str[pos++];
+				continue;
+			}
+			if (chr == 119) // 'Wait'
+				break;
+			if (chr == 110) { // 'Newline'
+				curw = 1;
+				continue;
+			}
+			if (chr == 104) // 'Don't terminate with \n'
+				break;
+		} else if (chr == '@')
 			continue;
 		if (chr == 254 || chr == 255) {
 			chr = str[pos++];





More information about the Scummvm-git-logs mailing list