Validating pak before putting it in menu list

include/TombRaider.h

@@ -124,7 +124,7 @@ public:
      * \param filename file to check
      * \returns 0 if it is a TombRaider pak
      */
-    int checkMime(char *filename);
+    static int checkMime(char *filename);
 
     /*!
      * \brief Loads TombRaider 1-5 pak into memory
@@ -669,7 +669,7 @@ private:
      */
     int loadTR5(FILE *f, void (*percent)(int, void *), void *obj);
 
-    void print(const char *methodName, const char *s, ...) __attribute__((format(printf, 3, 4)));
+    static void print(const char *methodName, const char *s, ...) __attribute__((format(printf, 2, 3)));
 
     void printDebug(const char *methodName, const char *s, ...) __attribute__((format(printf, 3, 4)));
 

include/TombRaiderData.h

@@ -19,6 +19,21 @@
 #pragma pack(push, tr2_h, 1)
 #endif
 
+#define TR_SOUND_FOOTSTEP0 1
+#define TR_SOUND_F_PISTOL  12
+
+#define TR_ANIAMTION_RUN            0
+#define TR_ANIAMTION_STAND          11
+#define TR_ANIAMTION_TURN_L         12
+#define TR_ANIAMTION_TURN_R         13
+#define TR_ANIAMTION_HIT_WALL_FRONT 53
+#define TR_ANIAMTION_SWIM_IDLE      87
+#define TR_ANIAMTION_SWIM           86
+#define TR_ANIAMTION_SWIM_L         143
+#define TR_ANIAMTION_SWIM_R         144
+#define TR_ANIAMTION_GRAB_LEDGE     96
+#define TR_ANIAMTION_PULLING_UP     97
+
 typedef enum {
     TR_VERSION_UNKNOWN,
     TR_VERSION_1,
@@ -58,9 +73,6 @@ typedef enum {
     tombraiderFace_PartialAlpha = (1 << 2)
 } tombraiderFace_Flags;
 
-#define TR_SOUND_FOOTSTEP0    1
-#define TR_SOUND_F_PISTOL    12
-
 enum TR4_Objects {
     TR4_LARA = 0,
     TR4_PISTOLS_ANIM = 1,
@@ -85,18 +97,6 @@ enum TR4_Objects {
     TR4_LARA_SPEECH_HEAD4 = 20
 };
 
-#define TR_ANIAMTION_RUN               0
-#define TR_ANIAMTION_STAND            11
-#define TR_ANIAMTION_TURN_L           12
-#define TR_ANIAMTION_TURN_R           13
-#define TR_ANIAMTION_HIT_WALL_FRONT   53
-#define TR_ANIAMTION_SWIM_IDLE        87
-#define TR_ANIAMTION_SWIM             86
-#define TR_ANIAMTION_SWIM_L          143
-#define TR_ANIAMTION_SWIM_R          144
-#define TR_ANIAMTION_GRAB_LEDGE       96
-#define TR_ANIAMTION_PULLING_UP       97
-
 /*!
  * \brief Basic 24-bit colour structure.
  *

src/OpenRaider.cpp

@@ -17,6 +17,7 @@
 #include "Game.h"
 #include "Menu.h"
 #include "Sound.h"
+#include "TombRaider.h"
 #include "Window.h"
 #include "utils/strings.h"
 #include "utils/time.h"
@@ -176,7 +177,7 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
     } else if (strcmp(command, "load") == 0) {
         if (mGame)
             delete mGame;
-        char *tmp = bufferString("%s%s", mPakDir, args->at(0));
+        char *tmp = bufferString("%s/%s", mPakDir, args->at(0));
         try {
             mGame = new Game(tmp);
             delete [] tmp;
@@ -553,14 +554,14 @@ void OpenRaider::loadPakFolderRecursive(const char *dir) {
                      || stringEndsWith(lowerPath, ".tr2")
                      || stringEndsWith(lowerPath, ".tr4")
                      || stringEndsWith(lowerPath, ".trc")) {
-                    //if (m_tombraider.checkMime(fullPathMap) == 0) {
-                        // mConsole->print("Validated pak: '%s'", fullPathMap);
-
+                    int error = TombRaider::checkMime(fullPathMap);
+                    if (error == 0) {
                         // Just load relative filename
-                        mMapList.push_back(bufferString("%s", (fullPathMap + strlen(mPakDir))));
-                    //} else {
-                    //    mConsole->print("ERROR: pak file '%s' not found or invalid", fullPathMap);
-                    //}
+                        mMapList.push_back(bufferString("%s", (fullPathMap + strlen(mPakDir) + 1)));
+                    } else {
+                        mConsole->print("Error: pak file '%s' %s",
+                                fullPathMap, (error == -1) ? "not found" : "invalid");
+                    }
                 }
 
                 delete [] lowerPath;

src/TombRaider.cpp

@@ -359,22 +359,18 @@ unsigned char *TombRaider::Palette8()
 }
 
 
-int TombRaider::checkMime(char *filename)
-{
+int TombRaider::checkMime(char *filename) {
     FILE *f;
     unsigned int version;
 
-
-    if (!filename || !filename[0])
-    {
+    if (!filename || !filename[0]) {
         print("checkFile", "Given filename was empty string or NULL");
         return -1;
     }
 
     f = fopen(filename, "rb");
 
-    if (!f)
-    {
+    if (!f) {
         perror(filename);
         return -1;
     }
@@ -383,20 +379,17 @@ int TombRaider::checkMime(char *filename)
     fread(&version, sizeof(version), 1, f);
     fclose(f);
 
-    switch (version)
-    {
+    switch (version) {
         case 0x00000020:
         case 0x0000002d:
         case 0xff080038:
         case 0xff180038:
-        case 0xfffffff0:           // bogus
-        case 0x00345254:           // "TR4\0"
+        case 0xfffffff0: // bogus
+        case 0x00345254: // "TR4\0"
             return 0;
         default:
-            ;
+            return 1;
     }
-
-    return 1;
 }