From a97a3c388675a76f9def98db441e8904232d118a Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 5 May 2018 20:30:43 +0200 Subject: [PATCH] PRINCE: Further work on support for extracted games --- engines/prince/resources.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/engines/prince/resources.cpp b/engines/prince/resources.cpp index bb3db040324..342c16e9006 100644 --- a/engines/prince/resources.cpp +++ b/engines/prince/resources.cpp @@ -83,11 +83,15 @@ bool PrinceEngine::loadLocation(uint16 locationNr) { const Common::String locationNrStr = Common::String::format("%02d", _locationNr); debugEngine("loadLocation %s", locationNrStr.c_str()); - PtcArchive *locationArchive = new PtcArchive(); - if (!locationArchive->open(locationNrStr + "/databank.ptc")) - error("Can't open location %s", locationNrStr.c_str()); + if (!(getFeatures() & GF_EXTRACTED)) { + PtcArchive *locationArchive = new PtcArchive(); + if (!locationArchive->open(locationNrStr + "/databank.ptc")) + error("Can't open location %s", locationNrStr.c_str()); - SearchMan.add(locationNrStr, locationArchive); + SearchMan.add(locationNrStr, locationArchive); + } else { + SearchMan.addSubDirectoryMatching(gameDataDir, locationNrStr); + } loadMusic(_locationNr);