Ticket #7252: extrapath.patch

base/main.cpp

@@ -34 +34 @@
 #include "base/plugins.h"
 #include "base/version.h"
 #include "common/config-manager.h"
+#include "common/file.h"
 #include "common/scaler.h"      // For GFX_NORMAL
 #include "common/timer.h"
 #include "gui/newgui.h"
@@ -259 +260 @@
         Engine *engine = detector.createEngine(system);
         assert(engine);
 
+        // Add extrapath (if any) to the directory search list
+        if (ConfMan.hasKey("extrapath"))
+                File::addDefaultDirectory(ConfMan.get("extrapath"));
+
         // Run the game engine
         engine->go();
 

graphics/animation.cpp

@@ -47 +47 @@
 
 
 bool BaseAnimationState::init(const char *name) {
-        const Common::String ePath = ConfMan.get("extrapath");
-
 #ifdef USE_MPEG2
         char tempFile[512];
 
@@ -65 +63 @@
 
         File f;
 
-        if (!f.open(tempFile) && !f.open(tempFile, File::kFileReadMode, ePath.c_str())) {
+        if (!f.open(tempFile)) {
                 warning("Cutscene: %s palette missing", tempFile);
                 return false;
         }
@@ -114 +112 @@
         // Open MPEG2 stream
         mpgfile = new File();
         sprintf(tempFile, "%s.mp2", name);
-        if (!mpgfile->open(tempFile) && 
-            !mpgfile->open(tempFile, File::kFileReadMode, ePath.c_str())) {
+        if (!mpgfile->open(tempFile)) {
                 warning("Cutscene: Could not open %s", tempFile);
                 return false;
         }
@@ -134 +131 @@
 
         // Play audio
         bgSoundStream = AudioStream::openStreamFile(name);
-        if (bgSoundStream == NULL)
-                bgSoundStream = AudioStream::openStreamFile(name, ePath.c_str());
 
         if (bgSoundStream != NULL) {
                 _snd->playInputStream(&bgSound, bgSoundStream, false, 255, 0, -1, false);

sword1/resman.cpp

@@ -58 +58 @@
 void ResMan::loadCluDescript(const char *fileName) {
         File resFile;
         resFile.open(fileName);
-        if (!resFile.isOpen()) {
-                // Uh-uh, file not found. Perhaps we're playing straight from CD2?
-                // Check the Extra Path.
-                const Common::String ePath = ConfMan.get("extrapath");
-                resFile.open(fileName, File::kFileReadMode, ePath.c_str());
-        }
 
         if (!resFile.isOpen()) {
                 char msg[512];