misc

ChangeLog.md

@@ -2,6 +2,10 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140520 ]
+    * cmake script checks for presence of functions needed for
+      recursive folder traversal
+
     [ 20140519 ]
     * No longer crashes simply by walking in the wrong place
     * Added walk Action, supposed to switch to slow walking/sidesteps

include/Texture.h

@@ -122,6 +122,8 @@ public:
      */
     int loadTGA(const char *filename);
 
+    int loadPCX(const char *filename);
+
     /*!
      * \brief Resets all texture data
      */

include/config.h.in

@@ -17,9 +17,21 @@
 #define DEFAULT_HEIGHT 480
 
 #cmakedefine USING_AL
+
 #cmakedefine HAVE_EXECINFO_H
 #cmakedefine HAVE_BACKTRACE
 #cmakedefine HAVE_BACKTRACE_SYMBOLS
 
+#cmakedefine HAVE_DIRENT_H
+#cmakedefine HAVE_OPENDIR
+#cmakedefine HAVE_READDIR_R
+#cmakedefine HAVE_CLOSEDIR
+#cmakedefine HAVE_DT_DIR
+
+#cmakedefine HAVE_WINDOWS_H
+#cmakedefine HAVE_FINDFIRSTFILE
+#cmakedefine HAVE_FINDNEXTFILE
+#cmakedefine HAVE_FINDCLOSE
+
 #endif
 

include/global.h

@@ -18,8 +18,8 @@
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #else
-#ifdef WIN32
-#include <Windows.h>
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
 #endif
 #include <GL/gl.h>
 #endif

src/CMakeLists.txt

@@ -85,12 +85,26 @@ endif (SDL2_FOUND AND SDL2TTF_FOUND)
 # Check for header/function presence
 include (CheckIncludeFiles)
 include (CheckFunctionExists)
+include (CheckSymbolExists)
 
 # backtrace() for assert with call stack output
 check_include_files (execinfo.h HAVE_EXECINFO_H)
 check_function_exists (backtrace HAVE_BACKTRACE)
 check_function_exists (backtrace_symbols HAVE_BACKTRACE_SYMBOLS)
 
+# readdir() for recursive folder traversal
+check_include_files (dirent.h HAVE_DIRENT_H)
+check_function_exists (opendir HAVE_OPENDIR)
+check_function_exists (readdir_r HAVE_READDIR_R)
+check_function_exists (closedir HAVE_CLOSEDIR)
+check_symbol_exists (DT_DIR "dirent.h" HAVE_DT_DIR)
+
+# recursive folder traversal for Windows
+check_include_files (windows.h HAVE_WINDOWS_H)
+check_function_exists (FindFirstFile HAVE_FINDFIRSTFILE)
+check_function_exists (FindNextFile HAVE_FINDNEXTFILE)
+check_function_exists (FindClose HAVE_FINDCLOSE)
+
 #################################################################
 
 # Configuration Header file

src/Menu.cpp

@@ -7,16 +7,22 @@
 
 #include <cctype>
 
-#ifndef WIN32
-#include <dirent.h>
-#endif
-
 #include "global.h"
 #include "Console.h"
 #include "Menu.h"
 #include "OpenRaider.h"
 #include "utils/strings.h"
 
+#if defined(HAVE_DIRENT_H) && defined(HAVE_OPENDIR) && defined(HAVE_READDIR_R) && defined(HAVE_CLOSEDIR) && defined(HAVE_DT_DIR)
+#include <dirent.h>
+#define USE_DIRENT
+#elif defined(HAVE_WINDOWS_H) && defined(HAVE_FINDFIRSTFILE) && defined(HAVE_FINDNEXTFILE) && defined(HAVE_FINDCLOSE)
+#include <windows.h>
+#define USE_FINDFILE
+#else
+#error No support for recursive folder traversal
+#endif
+
 Menu::Menu() {
     mVisible = false;
     mCursor = 0;
@@ -55,54 +61,14 @@ bool Menu::isVisible() {
 
 #ifdef WIN32
 void Menu::loadPakFolderHelper(std::vector<char *> &list) {
-    WIN32_FIND_DATA fd;
-    char *tmp = bufferString("%s\\*", list.at(0));
-    HANDLE hFind = FindFirstFile(tmp, &fd);
-    do {
-        if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-            list.push_back(bufferString("%s\\%s", list.at(0), fd.cFileName));
-        } else {
-            char *fullPathMap = bufferString("%s\\%s", list.at(0), fd.cFileName);
-
-            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")) {
-                int error = TombRaider::checkMime(fullPathMap);
-                if (error == 0) {
-                    // Just load relative filename
-                    mMapList.push_back(bufferString("%s", (fullPathMap + strlen(getOpenRaider().mPakDir) + 1)));
-                } else {
-                    getConsole().print("Error: pak file '%s' %s",
-                            fullPathMap, (error == -1) ? "not found" : "invalid");
-                }
-            }
 
-            delete [] lowerPath;
-            delete [] fullPathMap;
-        }
-    } while (FindNextFile(hFind, &fd) != 0);
-    FindClose(hFind);
-    delete [] tmp;
-    delete [] list.at(0);
-    list.erase(list.begin());
 }
 #endif
 
 void Menu::loadPakFolderRecursive(const char *dir) {
     assert(dir != NULL);
     assert(dir[0] != '\0');
-#ifdef WIN32
-    std::vector<char *> list;
-    list.push_back(bufferString("%s", dir));
-    do {
-        loadPakFolderHelper(list);
-    } while (list.size() > 0);
-#else
+#ifdef USE_DIRENT
     struct dirent entry;
     struct dirent *ep = NULL;
     DIR *pakDir;
@@ -150,6 +116,46 @@ void Menu::loadPakFolderRecursive(const char *dir) {
     } else {
         getConsole().print("Could not open PAK dir %s!", dir);
     }
+#elif defined(USE_FINDFILE)
+    std::vector<char *> list;
+    list.push_back(bufferString("%s", dir));
+    do {
+        WIN32_FIND_DATA fd;
+        char *tmp = bufferString("%s\\*", list.at(0));
+        HANDLE hFind = FindFirstFile(tmp, &fd);
+        do {
+            if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+                list.push_back(bufferString("%s\\%s", list.at(0), fd.cFileName));
+            } else {
+                char *fullPathMap = bufferString("%s\\%s", list.at(0), fd.cFileName);
+
+                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")) {
+                    int error = TombRaider::checkMime(fullPathMap);
+                    if (error == 0) {
+                        // Just load relative filename
+                        mMapList.push_back(bufferString("%s", (fullPathMap + strlen(getOpenRaider().mPakDir) + 1)));
+                    } else {
+                        getConsole().print("Error: pak file '%s' %s",
+                                fullPathMap, (error == -1) ? "not found" : "invalid");
+                    }
+                }
+
+                delete [] lowerPath;
+                delete [] fullPathMap;
+            }
+        } while (FindNextFile(hFind, &fd) != 0);
+        FindClose(hFind);
+        delete [] tmp;
+        delete [] list.at(0);
+        list.erase(list.begin());
+    } while (list.size() > 0);
 #endif
 }
 

src/Render.cpp

@@ -101,18 +101,19 @@ int Render::initTextures(char *textureDir) {
     if (mTexture.loadColorTexture(color, 32, 32) > -1)
         numTextures++;
 
-#ifdef PCX_PROOF_OF_CONCEPT
-    filename = bufferString("/Users/thomas/.OpenRaider/paks/tr2/TITLE.PCX");
-    if (mTexture.loadTGA(filename) > -1)
+    // Temporary
+    filename = bufferString("%s/tr2/TITLE.PCX", getOpenRaider().mPakDir);
+    if (mTexture.loadPCX(filename) > -1) {
         numTextures++;
-    delete [] filename;
-#else
-    //! \fixme Error Checking. Return negative error code, check in calling place too
-    filename = bufferString("%s/%s", textureDir, "splash.tga");
-    if (mTexture.loadTGA(filename) > -1)
-        numTextures++;
-    delete [] filename;
-#endif
+        delete [] filename;
+    } else {
+        delete [] filename;
+        //! \fixme Error Checking. Return negative error code, check in calling place too
+        filename = bufferString("%s/%s", textureDir, "splash.tga");
+        if (mTexture.loadTGA(filename) > -1)
+            numTextures++;
+        delete [] filename;
+    }
 
     return numTextures;
 }

src/Texture.cpp

@@ -279,8 +279,7 @@ void Texture::bindTextureId(unsigned int n) {
     glBindTexture(GL_TEXTURE_2D, mTextureIds[n]);
 }
 
-int Texture::loadTGA(const char *filename) {
-#ifdef PCX_PROOF_OF_CONCEPT
+int Texture::loadPCX(const char *filename) {
     unsigned char *image;
     unsigned int w, h;
     int id = -1;
@@ -290,7 +289,9 @@ int Texture::loadTGA(const char *filename) {
         delete [] image;
     }
     return id;
-#else
+}
+
+int Texture::loadTGA(const char *filename) {
     FILE *f;
     unsigned char *image = NULL;
     unsigned char *image2 = NULL;
@@ -333,7 +334,6 @@ int Texture::loadTGA(const char *filename) {
     }
 
     return id;
-#endif
 }
 
 int Texture::nextPower(int seed) {