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

[athrxx at users.sourceforge.net]

Revision: 32253
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32253&view=rev
Author:   athrxx
Date:     2008-05-24 11:31:16 -0700 (Sat, 24 May 2008)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_hof.cpp
    scummvm/trunk/engines/kyra/script_hof.cpp
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/gui_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_hof.cpp	2008-05-24 17:56:56 UTC (rev 32252)
+++ scummvm/trunk/engines/kyra/gui_hof.cpp	2008-05-24 18:31:16 UTC (rev 32253)
@@ -455,12 +455,12 @@
 	char filename[16];
 
 	sprintf(filename, "PAGE%.01X.", _bookCurPage);
-	strcat(filename, _languageExtension[(_flags.platform == Common::kPlatformPC && (_flags.isTalkie || _lang)) ? _lang : 4]);
+	strcat(filename, (_flags.isTalkie || _flags.platform == Common::kPlatformFMTowns || _lang) ? _languageExtension[_lang] : "TXT");
 	uint8 *leftPage = _res->fileData(filename, 0);
 	int leftPageY = _bookPageYOffset[_bookCurPage];
 
 	sprintf(filename, "PAGE%.01X.", _bookCurPage+1);
-	strcat(filename, _languageExtension[(_flags.platform == Common::kPlatformPC && _flags.isTalkie || _lang) ? _lang : 4]);
+	strcat(filename, (_flags.isTalkie || _flags.platform == Common::kPlatformFMTowns || _lang) ? _languageExtension[_lang] : "TXT");
 	uint8 *rightPage = (_bookCurPage != _bookMaxPage) ? _res->fileData(filename, 0) : 0;
 	int rightPageY = _bookPageYOffset[_bookCurPage+1];
 

Modified: scummvm/trunk/engines/kyra/script_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_hof.cpp	2008-05-24 17:56:56 UTC (rev 32252)
+++ scummvm/trunk/engines/kyra/script_hof.cpp	2008-05-24 18:31:16 UTC (rev 32253)
@@ -800,7 +800,7 @@
 	_screen->fadeToBlack(0x14);
 	
 	sprintf(filename, "LETTER%.1d.", letter);
-	strcat(filename, _languageExtension[(_flags.platform == Common::kPlatformPC && (_flags.isTalkie || _lang)) ? _lang : 4]);
+	strcat(filename, (_flags.isTalkie || _flags.platform == Common::kPlatformFMTowns || _lang) ? _languageExtension[_lang] : "TXT");
 
 	uint8 *letterBuffer = _res->fileData(filename, 0);
 	if (letterBuffer) {

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2008-05-24 17:56:56 UTC (rev 32252)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2008-05-24 18:31:16 UTC (rev 32253)
@@ -1549,7 +1549,6 @@
 	"ITA",		Italian and Spanish were never included
 	"SPA"*/
 	"JPN",
-	"TXT"		// This is used for spell book and letter text
 };
 
 const char *KyraEngine_HoF::_scriptLangExt[] = {


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