aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Kagerer2008-05-24 17:56:56 +0000
committerFlorian Kagerer2008-05-24 17:56:56 +0000
commit4641f3fe7b11b25ad8dca6fc2ea68f8b72db9dae (patch)
treee85b101b8a4ea10e57a4abbf0b8b117777b5f559
parentec3bc8f84d007c45b0bf27cdfe19bfa95efe4a66 (diff)
downloadscummvm-rg350-4641f3fe7b11b25ad8dca6fc2ea68f8b72db9dae.tar.gz
scummvm-rg350-4641f3fe7b11b25ad8dca6fc2ea68f8b72db9dae.tar.bz2
scummvm-rg350-4641f3fe7b11b25ad8dca6fc2ea68f8b72db9dae.zip
more fixes for spellbook/letter text in Hof (French and German floppy)
svn-id: r32252
-rw-r--r--engines/kyra/gui_hof.cpp4
-rw-r--r--engines/kyra/script_hof.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp
index f7b2b4418d..5cb5774d2b 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 : 4]);
+ strcat(filename, _languageExtension[(_flags.platform == Common::kPlatformPC && (_flags.isTalkie || _lang)) ? _lang : 4]);
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 : 4]);
+ strcat(filename, _languageExtension[(_flags.platform == Common::kPlatformPC && _flags.isTalkie || _lang) ? _lang : 4]);
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 2e90379e62..b16e534e72 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 : 4]);
+ strcat(filename, _languageExtension[(_flags.platform == Common::kPlatformPC && (_flags.isTalkie || _lang)) ? _lang : 4]);
uint8 *letterBuffer = _res->fileData(filename, 0);
if (letterBuffer) {