[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.136,1.137

Max Horn fingolfin at users.sourceforge.net
Sun Jun 8 17:41:07 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31631

Modified Files:
	string.cpp 
Log Message:
Fix for bug #746850 (this change was originally meant to 'fix' turning of subtitles in V7/8 games; however this is a totally wrong way to achieve that)

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- string.cpp	9 Jun 2003 00:35:32 -0000	1.136
+++ string.cpp	9 Jun 2003 00:40:53 -0000	1.137
@@ -261,7 +261,10 @@
 				has_talk_sound = true;
 				buffer += 14;
 	
-				// Set flag that speech variant exist of this msg
+				// Set flag that speech variant exist of this msg.
+				// TODO: This does not work for the speech system in V7+ games
+				// since they encode the voice information differently, and it
+				// is being stripped from the string before it ever gets here.
 				if (_haveMsg == 0xFF)
 					_haveMsg = 0xFE;
 				break;
@@ -298,9 +301,6 @@
 				c += *buffer++ * 256;
 			if (_version <= 3) {
 				_charset->printChar(c);
-			} else if (_version >= 6) {
-				if (!_noSubtitles || (_haveMsg != 0xFE && _haveMsg != 0xFF))
-					_charset->printChar(c);
 			} else {
 				if (!_noSubtitles || _haveMsg != 0xFE)
 					_charset->printChar(c);





More information about the Scummvm-git-logs mailing list