[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.279,1.280

[Max Horn]

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

Modified Files:
	string.cpp 
Log Message:
Added FIXME for the _haveMsg hack

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -d -r1.279 -r1.280
--- string.cpp	20 Apr 2005 18:21:11 -0000	1.279
+++ string.cpp	20 Apr 2005 20:20:31 -0000	1.280
@@ -329,6 +329,7 @@
 					a->startAnimActor(frme);
 				break;
 			case 10:
+				// Note the similarity to the code in unkMessage1()
 				talk_sound_a = buffer[0] | (buffer[1] << 8) | (buffer[4] << 16) | (buffer[5] << 24);
 				talk_sound_b = buffer[8] | (buffer[9] << 8) | (buffer[12] << 16) | (buffer[13] << 24);
 				buffer += 14;
@@ -339,6 +340,10 @@
 				// This is actually a hack added by ScummVM; the original did
 				// subtitle hiding in some other way. I am not sure exactly
 				// how, though.
+				// FIXME: This is actually a rather ugly hack, and we should consider
+				// replacing it with something better; problem is that _haveMsg is saved,
+				// so we need to cope with old save games if we ever change this.
+				// And BTW Fingolfin was responsible for this silly bad hack. Stupid me! :-).
 				if (_haveMsg == 0xFF)
 					_haveMsg = 0xFE;
 				break;