From c94b6a438952c9d20b9a07d0a8712e9e2be25c7c Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 26 Mar 2019 20:19:21 +0100
Subject: KYRA: (EOB2/Amiga) - fix text resource loading

---
 engines/kyra/engine/eobcommon.cpp | 16 +++++++++++++---
 1 file 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);
-- 
cgit v1.2.3