From 78401ad55a60eb1eaafd1f0760caa4a50ec6a9a2 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 20 Nov 2013 23:33:22 +0100
Subject: KYRA: Only pick up PAK and APK files in the game dir in Kyra1/EoB1.

This should fix annoying erroring out when invalid PAK or APK files are
in the CWD (like for example some Android package files).
---
 engines/kyra/resource.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines/kyra/resource.cpp')

diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index c350c81742..7a1abe8dd9 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -74,10 +74,14 @@ bool Resource::reset() {
 
 			loadProtectedFiles(list);
 		} else {
+			// We only search in the game path to avoid any invalid PAK or
+			// APK files from being picked up. This might happen, for example,
+			// when the user has an Android package file in the CWD.
+			Common::FSDirectory gameDir(dir);
 			Common::ArchiveMemberList files;
 
-			_files.listMatchingMembers(files, "*.PAK");
-			_files.listMatchingMembers(files, "*.APK");
+			gameDir.listMatchingMembers(files, "*.PAK");
+			gameDir.listMatchingMembers(files, "*.APK");
 
 			for (Common::ArchiveMemberList::const_iterator i = files.begin(); i != files.end(); ++i) {
 				Common::String name = (*i)->getName();
-- 
cgit v1.2.3