STARTREK: Fix failed action texts

scummvm · Aug 18, 2019 · 8e69e9e · 8e69e9e
1 parent 6a9969e
commit 8e69e9e
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/engines/startrek/startrek.cpp b/engines/startrek/startrek.cpp
@@ -628,18 +628,25 @@ Common::String StarTrekEngine::getLoadedText(int textIndex) {
 
 	Common::String str;
 	byte cur;
-	while (textIndex != 0) {
+	int curIndex = 0;
+
+	while (!txtFile->eos()) {
 		do {
 			cur = txtFile->readByte();
-			if (cur != '\0')
-				str += cur;
+			str += cur;
 		} while (cur != '\0');
-		textIndex--;
-	}
 
-	delete txtFile;
+		if (curIndex == textIndex) {
+			delete txtFile;
+			return str;
+		}
 
-	return str;
+		curIndex++;
+		str = "";
+	}
+
+	delete txtFile;
+	return "";
 }
 
 } // End of namespace StarTrek