[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.382,2.383

[Max Horn]

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

Modified Files:
	scummvm.cpp 
Log Message:
fix for bug #770042 (LOOM: Some bits of dialogue are repeated)

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.382
retrieving revision 2.383
diff -u -d -r2.382 -r2.383
--- scummvm.cpp	9 Sep 2003 20:54:18 -0000	2.382
+++ scummvm.cpp	10 Sep 2003 00:28:26 -0000	2.383
@@ -1248,6 +1248,13 @@
 	if (VAR_EGO != 0xFF)
 		oldEgo = VAR(VAR_EGO);
 
+	// In V1-V3 games, CHARSET_1 is called much earlier than in newer games.
+	// See also bug #770042 for a case were this makes a difference.
+	// FIXME: Actually I am only sure that this is correct for V1-V2 and Loom.
+	// We should also check Indy3 & Zak256.
+	if (_version <= 3)
+		CHARSET_1();
+
 	processKbd();
 
 	if (_features & GF_NEW_CAMERA) {
@@ -1385,13 +1392,15 @@
 	}
 	
 	if (_currentRoom == 0) {
-		CHARSET_1();
+		if (_version > 3)
+			CHARSET_1();
 		drawDirtyScreenParts();
 	} else {
 		walkActors();
 		moveCamera();
 		fixObjectFlags();
-		CHARSET_1();
+		if (_version > 3)
+			CHARSET_1();
 
 		if (camera._cur.x != camera._last.x || _BgNeedsRedraw || _fullRedraw
 				|| ((_features & GF_NEW_CAMERA) && camera._cur.y != camera._last.y)) {