check file extension of level paks

ChangeLog

@@ -5,6 +5,11 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140305 ]
+	* Now using cmake build system
+	* Pak file extensions are checked to see if they could be valid
+	* Bugfix: String was used after being deleted in OpenRaider.cpp
+
 	[ 20140304 ]
 	* Removed memory test
 

include/System.h

@@ -90,6 +90,14 @@ public:
     static char *getFileFromFullPath(char *filename);
 
     /*!
+     * \brief Check if a string ends with another string.
+     * \param str string to check
+     * \param suffix suffix for which to check
+     * \returns true if str ends with suffix
+     */
+    static bool stringEndsWith(const char *str, const char *suffix);
+
+    /*!
      * \brief Gets the game tick
      * \returns number of milliseconds since start of program
      */

src/OpenRaider.cpp

@@ -3349,25 +3349,29 @@ void OpenRaider::loadPakFolderRecursive(const char *dir) {
                     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;
+                char *lowerPath = bufferString("%s", fullPathMap);
+                for (char *p = lowerPath; *p; ++p) *p = (char)tolower(*p);
+
+                // Check for valid extension
+                if (stringEndsWith(lowerPath, ".phd")
+                     || stringEndsWith(lowerPath, ".tr2")
+                     || stringEndsWith(lowerPath, ".tr4")
+                     || stringEndsWith(lowerPath, ".trc")) {
+                    if (m_tombraider.checkMime(fullPathMap) == 0) {
+                        // printf("Validated pak: '%s'\n", 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);
+                        // 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;
+                        delete [] fullPathMap;
+                    }
                 }
+
+                delete [] lowerPath;
             }
         }
         closedir(pakDir);

src/System.cpp

@@ -73,6 +73,19 @@ System::~System()
 // Public Accessors
 ////////////////////////////////////////////////////////////
 
+bool System::stringEndsWith(const char *str, const char *suffix) {
+    if (!str || !suffix)
+        return false;
+
+    size_t lenstr = strlen(str);
+    size_t lensuffix = strlen(suffix);
+
+    if (lensuffix > lenstr)
+        return false;
+
+    return strncmp(str + lenstr - lensuffix, suffix, lensuffix) == 0;
+}
+
 char *System::bufferString(const char *string, ...)
 {
     int sz = 60;