aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorathrxx2019-03-26 20:19:21 +0100
committerathrxx2019-04-13 18:55:00 +0200
commitc94b6a438952c9d20b9a07d0a8712e9e2be25c7c (patch)
treed032f4dc3ba8744e8d0e10ca470a9a38df562959 /engines
parentba9a4cd6e19f084f5209075bce77c067ed7f0051 (diff)
downloadscummvm-rg350-c94b6a438952c9d20b9a07d0a8712e9e2be25c7c.tar.gz
scummvm-rg350-c94b6a438952c9d20b9a07d0a8712e9e2be25c7c.tar.bz2
scummvm-rg350-c94b6a438952c9d20b9a07d0a8712e9e2be25c7c.zip
KYRA: (EOB2/Amiga) - fix text resource loading
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/engine/eobcommon.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/engines/kyra/engine/eobcommon.cpp b/engines/kyra/engine/eobcommon.cpp
index d7fad04a57..792cf10008 100644
--- a/engines/kyra/engine/eobcommon.cpp
+++ b/engines/kyra/engine/eobcommon.cpp
@@ -1346,7 +1346,10 @@ void EoBCoreEngine::npcSequence(int npcIndex) {
drawNpcScene(npcIndex);
Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
- _screen->loadFileDataToPage(s, 5, 32000);
+ if (s)
+ _screen->loadFileDataToPage(s, 5, 32000);
+ else
+ _screen->loadBitmap("TEXT.CPS", 5, 5, 0, true);
delete s;
gui_drawBox(0, 121, 320, 79, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
@@ -1594,7 +1597,10 @@ void EoBCoreEngine::initDialogueSequence() {
snd_stopSound();
Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
- _screen->loadFileDataToPage(s, 5, 32000);
+ if (s)
+ _screen->loadFileDataToPage(s, 5, 32000);
+ else
+ _screen->loadBitmap("TEXT.CPS", 5, 5, 0, true);
_txt->setupField(9, 0);
delete s;
}
@@ -1798,7 +1804,11 @@ void EoBCoreEngine::displayParchment(int id) {
if (id >= 0) {
// display text
Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
- _screen->loadFileDataToPage(s, 5, 32000);
+ if (s)
+ _screen->loadFileDataToPage(s, 5, 32000);
+ else
+ _screen->loadBitmap("TEXT.CPS", 5, 5, 0, true);
+ delete s;
_screen->set16bitShadingLevel(4);
gui_drawBox(0, 0, 176, 175, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
_screen->set16bitShadingLevel(0);