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

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Sun Jun 22 14:41:46 CEST 2008


Revision: 32753
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32753&view=rev
Author:   athrxx
Date:     2008-06-22 05:41:46 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
missed this in last commit (bug fix for #1997149)

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

Modified: scummvm/trunk/engines/kyra/script_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_hof.cpp	2008-06-22 12:39:40 UTC (rev 32752)
+++ scummvm/trunk/engines/kyra/script_hof.cpp	2008-06-22 12:41:46 UTC (rev 32753)
@@ -800,9 +800,15 @@
 	_screen->fadeToBlack(0x14);
 	
 	sprintf(filename, "LETTER%.1d.", letter);
-	strcat(filename, (_flags.isTalkie || _flags.platform == Common::kPlatformFMTowns || _lang) ? _languageExtension[_lang] : "TXT");
+	strcat(filename, _languageExtension[_lang]);
+	uint8 *letterBuffer = _res->fileData(filename, 0);
+	if (!letterBuffer) {
+		// some floppy versions use a TXT extension
+		sprintf(filename, "LETTER%.1d.", letter);
+		strcat(filename, "TXT");
+		letterBuffer = _res->fileData(filename, 0);
+	}
 
-	uint8 *letterBuffer = _res->fileData(filename, 0);
 	if (letterBuffer) {
 		bookDecodeText(letterBuffer);
 		bookPrintText(2, letterBuffer, 0xC, 0xA, 0x20);


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




More information about the Scummvm-git-logs mailing list