diff options
| author | Florian Kagerer | 2008-05-24 18:31:16 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2008-05-24 18:31:16 +0000 |
| commit | 5968d62d3449026737724c9a00c0360724b0016b (patch) | |
| tree | e674afb1f49fc3454798f64c57f9fd59e441b809 | |
| parent | 4641f3fe7b11b25ad8dca6fc2ea68f8b72db9dae (diff) | |
| download | scummvm-rg350-5968d62d3449026737724c9a00c0360724b0016b.tar.gz scummvm-rg350-5968d62d3449026737724c9a00c0360724b0016b.tar.bz2 scummvm-rg350-5968d62d3449026737724c9a00c0360724b0016b.zip | |
cleanup
svn-id: r32253
| -rw-r--r-- | engines/kyra/gui_hof.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/script_hof.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/staticres.cpp | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp index 5cb5774d2b..555934cb7f 100644 --- a/engines/kyra/gui_hof.cpp +++ b/engines/kyra/gui_hof.cpp @@ -455,12 +455,12 @@ void KyraEngine_HoF::showBookPage() { 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]; diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp index b16e534e72..ef50cc8dfd 100644 --- a/engines/kyra/script_hof.cpp +++ b/engines/kyra/script_hof.cpp @@ -800,7 +800,7 @@ int KyraEngine_HoF::o2_showLetter(EMCState *script) { _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) { diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index fe9925c44e..b28fa45262 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -1549,7 +1549,6 @@ const char *KyraEngine_HoF::_languageExtension[] = { "ITA", Italian and Spanish were never included "SPA"*/ "JPN", - "TXT" // This is used for spell book and letter text }; const char *KyraEngine_HoF::_scriptLangExt[] = { |