FREESCAPE: read strings in dark relese for amiga

digitall · Aug 16, 2023 · 2638372 · 2638372
1 parent 35ff362
commit 2638372
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/engines/freescape/freescape.h b/engines/freescape/freescape.h
@@ -372,7 +372,7 @@ class FreescapeEngine : public Engine {
 	Common::StringArray _messagesList;
 
 	void loadMessagesFixedSize(Common::SeekableReadStream *file, int offset, int size, int number);
-	void loadMessagesVariableSize(Common::SeekableReadStream *file, int offset, int number);
+	virtual void loadMessagesVariableSize(Common::SeekableReadStream *file, int offset, int number);
 
 	void loadFonts(Common::SeekableReadStream *file, int offset);
 	void loadFonts(byte *font, int charNumber);
@@ -563,6 +563,7 @@ class DarkEngine : public FreescapeEngine {
 	void loadAssetsAmigaFullGame() override;
 
 	void loadAssetsZXDemo() override;
+	void loadMessagesVariableSize(Common::SeekableReadStream *file, int offset, int number) override;
 
 	int _lastTenSeconds;
 	int _lastSecond;

diff --git a/engines/freescape/games/dark/amiga.cpp b/engines/freescape/games/dark/amiga.cpp
@@ -75,6 +75,7 @@ void DarkEngine::loadAssetsAmigaFullGame() {
 	_border = loadAndConvertNeoImage(stream, 0x1b762);
 	load8bitBinary(stream, 0x2e96a, 16);
 	loadPalettes(stream, 0x2e638);
+	loadMessagesVariableSize(stream, 0x3d37, 66);
 }
 
 void DarkEngine::drawAmigaAtariSTUI(Graphics::Surface *surface) {

diff --git a/engines/freescape/games/dark/dark.cpp b/engines/freescape/games/dark/dark.cpp
@@ -775,6 +775,24 @@ void DarkEngine::drawInfoMenu() {
 	delete surface;
 }
 
+void DarkEngine::loadMessagesVariableSize(Common::SeekableReadStream *file, int offset, int number) {
+	file->seek(offset);
+	debugC(1, kFreescapeDebugParser, "String table:");
+
+	for (int i = 0; i < number; i++) {
+		Common::String message = "";
+		while (true) {
+			byte c = file->readByte();
+			if (c <= 21)
+				break;
+			message = message + c;
+		}
+
+		_messagesList.push_back(message);
+		debugC(1, kFreescapeDebugParser, "'%s'", _messagesList[i].c_str());
+	}
+}
+
 Common::Error DarkEngine::saveGameStreamExtended(Common::WriteStream *stream, bool isAutosave) {
 	for (auto &it : _areaMap) {
 		stream->writeUint16LE(it._key);

diff --git a/engines/freescape/loaders/8bitBinaryLoader.cpp b/engines/freescape/loaders/8bitBinaryLoader.cpp
@@ -1015,7 +1015,7 @@ void FreescapeEngine::loadMessagesVariableSize(Common::SeekableReadStream *file,
 		}
 
 		_messagesList.push_back(message);
-		debugC(1, kFreescapeDebugParser, "%s", _messagesList[i].c_str());
+		debugC(1, kFreescapeDebugParser, "'%s'", _messagesList[i].c_str());
 	}
 }