[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.156,2.157

kirben kirben at users.sourceforge.net
Fri Nov 4 15:52:38 CET 2005


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

Modified Files:
	charset.cpp 
Log Message:

Add missing case for HE games.
Fix regression in HE games I caused.


Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.156
retrieving revision 2.157
diff -u -d -r2.156 -r2.157
--- charset.cpp	4 Nov 2005 13:09:56 -0000	2.156
+++ charset.cpp	4 Nov 2005 23:52:01 -0000	2.157
@@ -298,10 +298,12 @@
 	int code = (_vm->_heversion >= 80) ? 127 : 64;
 
 	while ((chr = text[pos++]) != 0) {
+		if (chr == '\n' || chr == '\r')
+			break;
 		if (_vm->_heversion >= 72) {
 			if (chr == code) {
 				chr = text[pos++];
-				if (chr == 84) {  // Strings of speech offset/size
+				if (chr == 84 || chr == 116) {  // Strings of speech offset/size
 					while (chr != code)
 						chr = text[pos++];
 					continue;
@@ -314,8 +316,6 @@
 		} else {
 			if (chr == '@')
 				continue;
-			if (chr == '\n' || chr == '\r')
-				break;
 			if (chr == 255 || (_vm->_version <= 6 && chr == 254)) {
 				chr = text[pos++];
 				if (chr == 3)	// 'WAIT'
@@ -365,7 +365,7 @@
 		if (_vm->_heversion >= 72) {
 			if (chr == code) {
 				chr = str[pos++];
-				if (chr == 84) {  // Strings of speech offset/size
+				if (chr == 84 || chr == 116) {  // Strings of speech offset/size
 					while (chr != code)
 						chr = str[pos++];
 					continue;





More information about the Scummvm-git-logs mailing list