Recursively search for level paks

ChangeLog

@@ -5,6 +5,11 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140221 ]
+	* Removed the `Map` command. Now the PakDir command causes
+	  a recursive search of the specified directory. Every file found
+	  is added to the map list if it validates.
+
 	[ 20140216 ]
 	* Removed the FastCard option. Not necessary on todays hardware?!
 	* Removed UNICODE_SUPPORT, not working this way with SDL2

README.md

@@ -82,9 +82,6 @@ The configuration file format is very simple:
 You can use paks from any Tomb Raider version supported and most user made paks for Tomb Raider.
 Only PHD, TR1, TR2, TR3, and TR4 paks are supported as of this writing.
 
-Edit 'Map' lines in your OpenRaider.init as needed.
-I suggest removing all your Map=... lines to begin with, since no maps are bundled with this release.
-
 ### Sound FXs
 
 Setting up external sound SFX, for TR2 and TR3 paks only.

data/OpenRaider.init

@@ -30,40 +30,11 @@ DisplayFPS=false
 MapDebug=false
 ModelDebug=false
 DumpTexture=false
+
 #Script=tr3/tombPC.dat
 #Music=tr4/039_TR4_Title_Q10.wav
 #Music=tr4/103_A3_Out_Night.wav
 #Music=tr4/108_A8_Coastal.wav
-#Map=custom/Yvel.tr2
-#Map=custom/villa2.phd
-#Map=custom/fenician1.phd
-#Map=custom/1984.tr2
-#Map=custom/bigchamber.tr4
-#Map=custom/cleopal.tr4
-#Map=custom/khysos.tr4
-#Map=custom/Nasa.tr2
-#Map=custom/mansionfrost.tr2
-#Map=tr1/gym.phd
-#Map=tr1/level1.phd
-#Map=tr1/level2.phd
-#Map=tr2/unwater.tr2
-#Map=tr3/willsden.tr2
-#Map=tr3/undersea.tr2
-#Map=tr3/scotland.tr2
-#Map=tr3/HOUSE.TR2
-#Map=tr3/zoo.tr2
-#Map=tr3/slinc.tr2
-#Map=tr3/temple.tr2
-#Map=tr3/shore.tr2
-#Map=tr3/chunnel.tr2
-#Map=tr4/angkor1.tr4
-#Map=tr4/ang_race.tr4
-#Map=tr4/karnak1.tr4
-#Map=tr4/lake.tr4
-#Map=tr4/settomb1.tr4
-#Map=tr4/settomb2.tr4
-#Map=tr4/title.tr4
-#Map=tr5/demo.trc
 
 [OpenRaider.Console]
 bind +console 96

include/OpenRaider.h

@@ -197,6 +197,8 @@ private:
      */
     void loadLevel(char *filename);
 
+    void loadPakFolderRecursive(const char *dir);
+
     static OpenRaider *mInstance; //!< Singleton use
     TombRaider m_tombraider;      //!< Tombraider data support
     Sound mSound;                 //!< 3d Audio support

src/OpenRaider.cpp

@@ -12,6 +12,7 @@
 #include <unistd.h>
 #include <math.h>
 #include <sys/types.h>
+#include <dirent.h>
 
 #ifdef DEBUG_MEMORY
 #include <memory_test.h>
@@ -3332,6 +3333,51 @@ void OpenRaider::consoleCommand(char *cmd)
 }
 
 
+void OpenRaider::loadPakFolderRecursive(const char *dir) {
+    struct dirent *ep;
+    DIR *pakDir;
+
+    pakDir = opendir(dir);
+    if (pakDir != NULL) {
+        while ((ep = readdir(pakDir)) != NULL) {
+            if (ep->d_type == DT_DIR) {
+                if ((strcmp(".", ep->d_name) != 0)
+                 && (strcmp("..", ep->d_name) != 0)) {
+                    char *tmp = bufferString("%s%s", dir, ep->d_name);
+                    char *next = fullPath(tmp, '/');
+                    loadPakFolderRecursive(next);
+                    delete next;
+                    delete tmp;
+                }
+            } else {
+                /*!
+                 * \fixme Currently just tries to validate every file
+                 * in the pak folders. Should check the exstension to
+                 * see if it could be a level pak...
+                 */
+
+                char *fullPathMap = bufferString("%s%s", dir, ep->d_name);
+
+                if (m_tombraider.checkMime(fullPathMap) == 0) {
+                    printf("Validated pak: '%s'\n", fullPathMap);
+                    delete [] fullPathMap;
+
+                    // Just load relative filename
+                    mMapList.pushBack(bufferString("%s", (fullPathMap + strlen(m_pakDir))));
+                } else {
+                    printf("ERROR: pak file '%s' not found or invalid\n", fullPathMap);
+
+                    delete [] fullPathMap;
+                }
+            }
+        }
+        closedir(pakDir);
+    } else {
+        printf("Could not open PAK dir %s!\n", dir);
+    }
+}
+
+
 void OpenRaider::handleCommand(char *cmd, unsigned int mode)
 {
     bool b;
@@ -3405,6 +3451,11 @@ void OpenRaider::handleCommand(char *cmd, unsigned int mode)
                 }
 
                 m_pakDir = fullPath(cmd, '/');
+
+                // Recursively search for level paks instead of
+                // naming individual levels 2014-02-21 xythobuz
+
+                loadPakFolderRecursive(m_pakDir);
             }
             else if (rc_command("HomeDir", cmd))
             {
@@ -3437,33 +3488,6 @@ void OpenRaider::handleCommand(char *cmd, unsigned int mode)
                     m_flags ^= OpenRaider_DebugMap;
                 }
             }
-            else if (rc_command("Map", cmd))
-            {
-                if (cmd[0])
-                {
-                    char *fullPathMap;
-
-
-                    fullPathMap = bufferString("%s%s", m_pakDir, cmd);
-
-                    if (m_tombraider.checkMime(fullPathMap) == 0)
-                    {
-                        printf("Validated pak: '%s'\n",
-                                fullPathMap);
-                        delete [] fullPathMap;
-
-                        /* Just load relative filename */
-                        mMapList.pushBack(bufferString("%s", cmd));
-                    }
-                    else
-                    {
-                        printf("ERROR: pak file '%s' not found or invalid\n",
-                                fullPathMap);
-
-                        delete [] fullPathMap;
-                    }
-                }
-            }
             // Mongoose 2001.12.31, Added music list back
             else if (rc_command("Music", cmd))
             {