[Scummvm-cvs-logs] SF.net SVN: scummvm: [22333] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 22333
Author:   lordhoto
Date:     2006-05-04 04:19:48 -0700 (Thu, 04 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22333&view=rev

Log Message:
-----------
Adds (partial) support for italian floppy. (still hardcoded strings are missing) (Bug # 1409244 ("KYRA: GFX problems with ITALIAN floppy")).

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra.h
    scummvm/trunk/engines/kyra/plugin.cpp
    scummvm/trunk/engines/kyra/sequences_v1.cpp
    scummvm/trunk/engines/kyra/staticres.cpp
Modified: scummvm/trunk/engines/kyra/kyra.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra.h	2006-05-04 06:55:35 UTC (rev 22332)
+++ scummvm/trunk/engines/kyra/kyra.h	2006-05-04 11:19:48 UTC (rev 22333)
@@ -54,6 +54,7 @@
 	GF_FRENCH	= 1 <<  5,
 	GF_GERMAN	= 1 <<  6,
 	GF_SPANISH	= 1 <<  7,
+	GF_ITALIAN	= 1 <<  8,
 	// other languages here
 	GF_LNGUNK	= 1 << 16,
 	GF_AMIGA	= 1 << 17	// this is no special version flag yet!

Modified: scummvm/trunk/engines/kyra/plugin.cpp
===================================================================
--- scummvm/trunk/engines/kyra/plugin.cpp	2006-05-04 06:55:35 UTC (rev 22332)
+++ scummvm/trunk/engines/kyra/plugin.cpp	2006-05-04 11:19:48 UTC (rev 22333)
@@ -71,6 +71,8 @@
 										"8909b41596913b3f5deaf3c9f1017b01", "GEMCUT.EMC"},
 	{ "kyra1", "The Legend of Kyrandia",		GI_KYRA1, GF_SPANISH | GF_FLOPPY, // floppy 1.8 from clemmy
 										"747861d2a9c643c59fdab570df5b9093", "GEMCUT.EMC"},
+	{ "kyra1", "The Legend of Kyrandia",		GI_KYRA1, GF_ITALIAN | GF_FLOPPY, // from gourry
+										"ef08c8c237ee1473fd52578303fc36df", "GEMCUT.EMC" },
 	//{ "kyra1", "The Legend of Kyrandia",		GI_KYRA1, GF_AMIGA | GF_FLOPPY | GF_ENGLISH,
 	//									"2bd1da653eaefd691e050e4a9eb68a64", "GEMCUT.PAK" },
 	{ "kyra1", "The Legend of Kyrandia",		GI_KYRA1, GF_ENGLISH | GF_TALKIE, 
@@ -110,6 +112,7 @@
 	{ "MAIN_FRE.CPS", GF_FRENCH, Common::FR_FRA },
 	{ "MAIN_GER.CPS", GF_GERMAN, Common::DE_DEU },
 	{ "MAIN_SPA.CPS", GF_SPANISH, Common::ES_ESP },
+	{ "MAIN_ITA.CPS", GF_ITALIAN, Common::IT_ITA },
 	{ 0, 0, Common::UNK_LANG }
 };
 

Modified: scummvm/trunk/engines/kyra/sequences_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v1.cpp	2006-05-04 06:55:35 UTC (rev 22332)
+++ scummvm/trunk/engines/kyra/sequences_v1.cpp	2006-05-04 11:19:48 UTC (rev 22333)
@@ -192,6 +192,8 @@
 		loadBitmap("TEXT_FRE.CPS", 3, 3, 0);
 	} else if (_features & GF_SPANISH) {
 		loadBitmap("TEXT_SPA.CPS", 3, 3, 0);
+	} else if (_features & GF_ITALIAN) {
+		loadBitmap("TEXT_ITA.CPS", 3, 3, 0);
 	} else {
 		warning("no story graphics file found");
 	}

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2006-05-04 06:55:35 UTC (rev 22332)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2006-05-04 11:19:48 UTC (rev 22333)
@@ -43,6 +43,7 @@
 	{ GF_FRENCH, "FRE" },
 	{ GF_GERMAN, "GER" },
 	{ GF_SPANISH, "SPA" },
+	{ GF_ITALIAN, "ITA" },
 	{ 0, 0 }
 };
 
@@ -752,16 +753,18 @@
 void KyraEngine::loadMainScreen(int page) {
 	_screen->clearPage(page);
 
-	if ((_features & GF_ENGLISH) && (_features & GF_TALKIE)) 
+	if ((_features & GF_ENGLISH) && (_features & GF_FLOPPY))
+		loadBitmap("MAIN15.CPS", page, page, 0);
+	else if ((_features & GF_ENGLISH) && (_features & GF_TALKIE)) 
 		loadBitmap("MAIN_ENG.CPS", page, page, 0);
 	else if(_features & GF_FRENCH)
 		loadBitmap("MAIN_FRE.CPS", page, page, 0);
 	else if(_features & GF_GERMAN)
 		loadBitmap("MAIN_GER.CPS", page, page, 0);
-	else if ((_features & GF_ENGLISH) && (_features & GF_FLOPPY))
-		loadBitmap("MAIN15.CPS", page, page, 0);
 	else if (_features & GF_SPANISH)
 		loadBitmap("MAIN_SPA.CPS", page, page, 0);
+	else if (_features & GF_ITALIAN)
+		loadBitmap("MAIN_ITA.CPS", page, page, 0);
 	else
 		warning("no main graphics file found");
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.