[Scummvm-git-logs] scummvm branch-2-3 -> d376e6095e8a55725042d981b22fcb9c30db09f7

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d376e6095e STARTREK: Fix loading of files in non-English versions - bug 12712


Commit: d376e6095e8a55725042d981b22fcb9c30db09f7
    https://github.com/scummvm/scummvm/commit/d376e6095e8a55725042d981b22fcb9c30db09f7
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-08-30T15:22:18+03:00

Commit Message:
STARTREK: Fix loading of files in non-English versions - bug 12712

Changed paths:
    engines/startrek/resource.cpp


diff --git a/engines/startrek/resource.cpp b/engines/startrek/resource.cpp
index 398ba76457..3a30744568 100644
--- a/engines/startrek/resource.cpp
+++ b/engines/startrek/resource.cpp
@@ -99,10 +99,15 @@ ResourceIndex Resource::getIndexEntry(Common::SeekableReadStream *indexFile) {
 	ResourceIndex index;
 
 	Common::String currentFile;
+	// Non-English versions contain junk characters in
+	// some file names. Skip them here
+	bool skip = false;
 	for (byte i = 0; i < 8; i++) {
 		char c = indexFile->readByte();
-		if (c)
+		if (c && !skip)
 			currentFile += c;
+		if (!c)
+			skip = true;
 	}
 
 	// The demo version has an empty entry in the end