[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.58,1.59

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Wed Oct 19 09:01:36 CEST 2005


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

Modified Files:
	kyra.cpp 
Log Message:
I hope I understood LordHoto correctly. This change fixes the English CD
version, at least.


Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- kyra.cpp	19 Oct 2005 10:29:34 -0000	1.58
+++ kyra.cpp	19 Oct 2005 15:59:40 -0000	1.59
@@ -847,14 +847,16 @@
 	debug(9, "KyraEngine::seq_introStory()");
 	_screen->clearPage(3);
 	_screen->clearPage(0);
-	if (_features & GF_ENGLISH) {
-		loadBitmap("TEXT.CPS", 3, 3, 0);
+	if ((_features & GF_ENGLISH) && (_features & GF_TALKIE)) {
+		loadBitmap("TEXT_ENG.CPS", 3, 3, 0);
 	} else if (_features & GF_GERMAN) {
 		loadBitmap("TEXT_GER.CPS", 3, 3, 0);
 	} else if (_features & GF_FRENCH) {
 		loadBitmap("TEXT_FRE.CPS", 3, 3, 0);
 	} else if (_features & GF_SPANISH) {
 		loadBitmap("TEXT_SPA.CPS", 3, 3, 0);
+	} else if ((_features & GF_ENGLISH) && (_features & GF_FLOPPY)) {
+		loadBitmap("TEXT.CPS", 3, 3, 0);
 	} else {
 		warning("no story graphics file found");
 	}





More information about the Scummvm-git-logs mailing list