thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

this should fix bug #1997149: KYRA2: no text in spellbook

Browse source 
svn-id: r32750
This commit is contained in:
Florian Kagerer 2008-06-22 12:31:05 +00:00
parent cc72a3b6b0
commit 3be9449e67
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
engines/kyra/gui_hof.cpp
View file

@ -455,13 +455,29 @@ void KyraEngine_HoF::showBookPage() {
char filename[16];
sprintf(filename, "PAGE%.01X.", _bookCurPage);
strcat(filename, (_flags.isTalkie || _flags.platform == Common::kPlatformFMTowns || _lang) ? _languageExtension[_lang] : "TXT");
strcat(filename, _languageExtension[_lang]);
uint8 *leftPage = _res->fileData(filename, 0);
if (!leftPage) {
// some floppy version use a TXT extension
sprintf(filename, "PAGE%.01X.", _bookCurPage);
strcat(filename, "TXT");
leftPage = _res->fileData(filename, 0);
}
int leftPageY = _bookPageYOffset[_bookCurPage];
sprintf(filename, "PAGE%.01X.", _bookCurPage+1);
strcat(filename, (_flags.isTalkie || _flags.platform == Common::kPlatformFMTowns || _lang) ? _languageExtension[_lang] : "TXT");
uint8 *rightPage = (_bookCurPage != _bookMaxPage) ? _res->fileData(filename, 0) : 0;
strcat(filename, _languageExtension[_lang]);
uint8 *rightPage = 0;
if (_bookCurPage != _bookMaxPage) {
rightPage = _res->fileData(filename, 0);
if (!rightPage) {
sprintf(filename, "PAGE%.01X.", _bookCurPage);
strcat(filename, "TXT");
rightPage = _res->fileData(filename, 0);
}
}
int rightPageY = _bookPageYOffset[_bookCurPage+1];
_screen->hideMouse();

3
engines/kyra/kyra_hof.cpp
View file

@ -296,6 +296,9 @@ int KyraEngine_HoF::go() {
_res->loadFileList("FILEDATA.FDT");
else
_res->loadFileList(_ingamePakList, _ingamePakListSize);
if (_flags.platform == Common::kPlatformPC98)
_res->loadPakFile("AUDIO.PAK");
}
_menuDirectlyToLoad = (_menuChoice == 3) ? true : false;