[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.254,1.255

[kirben]

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

Modified Files:
	saveload.cpp 
Log Message:

Fix subtitle regressions.


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- saveload.cpp	2 Nov 2005 21:47:43 -0000	1.254
+++ saveload.cpp	4 Nov 2005 09:57:13 -0000	1.255
@@ -956,8 +956,12 @@
 	// Before V61, we re-used the _haveMsg flag to handle "alternative" speech
 	// sound files (see charset code 10).
 	if (s->isLoading() && s->getVersion() < VER(61)) {
-		_haveActorSpeechMsg = (_haveMsg != 0xFE);
-		_haveMsg = 0xFF;
+		if (_haveMsg == 0xFE) {
+			_haveActorSpeechMsg = false;
+			_haveMsg = 0xFF;
+		} else {
+			_haveActorSpeechMsg = true;
+		}
 	}
 
 	//