Maplist now in Menu

ChangeLog

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140416 ]
+	* Map list now stored in Menu
+
 	[ 20140405 ]
 	* "Ported" all commands from old source
 	* Slimmed down Camera considerably

include/Menu.h

@@ -38,6 +38,10 @@ public:
 
 private:
 
+    void loadPakFolderRecursive(const char *dir);
+
+    void fillMapList();
+
     void displayMapList();
 
     bool mVisible;
@@ -45,6 +49,10 @@ private:
     unsigned int mMin;
 
     WindowString mainText;
+
+    bool mMapListFilled;
+    bool mFirstPass;
+    std::vector<char *> mMapList;
 };
 
 #endif

include/OpenRaider.h

@@ -58,10 +58,6 @@ public:
     void handleMouseScroll(int xrel, int yrel);
 
     //! \fixme should be private
-
-    bool mMapListFilled;
-    std::vector<char *> mMapList;
-
     char *mBaseDir;
     char *mPakDir;
     char *mAudioDir;
@@ -81,10 +77,6 @@ private:
 
     int bind(ActionEvents action, const char *key);
 
-    void loadPakFolderRecursive(const char *dir);
-
-    void fillMapList();
-
     bool mRunning;
     bool mFPS;
 

src/Menu.cpp

@@ -5,6 +5,9 @@
  * \author xythobuz
  */
 
+#include <assert.h>
+#include <dirent.h>
+
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #else
@@ -31,10 +34,18 @@ Menu::Menu() {
     mainText.y = 10;
     mainText.w = 0;
     mainText.h = 0;
+
+    mMapListFilled = false;
+    mFirstPass = false;
 }
 
 Menu::~Menu() {
     delete [] mainText.text;
+
+    while (mMapList.size() > 0) {
+        delete [] mMapList.back();
+        mMapList.pop_back();
+    }
 }
 
 void Menu::setVisible(bool visible) {
@@ -45,6 +56,66 @@ bool Menu::isVisible() {
     return mVisible;
 }
 
+void Menu::loadPakFolderRecursive(const char *dir) {
+    struct dirent entry;
+    struct dirent *ep = NULL;
+    DIR *pakDir;
+
+    assert(dir != NULL);
+    assert(dir[0] != '\0');
+
+    pakDir = opendir(dir);
+    if (pakDir != NULL) {
+        readdir_r(pakDir, &entry, &ep);
+        while (ep != 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 {
+                char *fullPathMap = bufferString("%s%s", dir, ep->d_name);
+
+                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;
+            }
+            readdir_r(pakDir, &entry, &ep);
+        }
+        closedir(pakDir);
+    } else {
+        getConsole().print("Could not open PAK dir %s!", dir);
+    }
+}
+
+void Menu::fillMapList() {
+    char *tmp = fullPath(getOpenRaider().mPakDir, '/');
+    loadPakFolderRecursive(tmp);
+    delete [] tmp;
+    mMapListFilled = true;
+}
+
 void Menu::displayMapList() {
     // Estimate displayable number of items
     int items = (getWindow().mHeight - 110) / 25;
@@ -56,15 +127,15 @@ void Menu::displayMapList() {
     else
         min = 0;
 
-    if ((mCursor + (items / 2)) < getOpenRaider().mMapList.size())
+    if ((mCursor + (items / 2)) < mMapList.size())
         max = mCursor + (items / 2);
     else
-        max = getOpenRaider().mMapList.size();
+        max = mMapList.size();
 
     while ((max - min) < items) {
         if (min > 0)
             min--;
-        else if (max < ((int)getOpenRaider().mMapList.size()))
+        else if (max < ((int)mMapList.size()))
             max++;
         else
             break;
@@ -73,7 +144,7 @@ void Menu::displayMapList() {
     mMin = min;
 
     for (int i = 0; i < (max - min); i++) {
-        char *map = getOpenRaider().mMapList[i + min];
+        char *map = mMapList[i + min];
         if ((i + min) == (int)mCursor)
             getWindow().drawText(25, 100 + (25 * i), 0.75f, RED, "%s", map);
         else
@@ -93,10 +164,10 @@ void Menu::display() {
         mainText.x = (getWindow().mWidth / 2) - (mainText.w / 2);
         getWindow().writeString(&mainText);
 
-        if (!getOpenRaider().mMapListFilled) {
+        if (!mMapListFilled) {
             getWindow().drawText(25, (getWindow().mHeight / 2) - 20, 0.75f, OR_BLUE, "Generating map list...");
         } else {
-            if (getOpenRaider().mMapList.size() == 0) {
+            if (mMapList.size() == 0) {
                 getWindow().drawText(25, (getWindow().mHeight / 2) - 20, 0.75f, RED, "No maps found! See README.md");
             } else {
                 // draw *play button* above list
@@ -109,6 +180,16 @@ void Menu::display() {
                 displayMapList();
             }
         }
+
+        // Fill map list after first render pass,
+        // so menu *loading screen* is visible
+        if (mFirstPass) {
+            if (!mMapListFilled) {
+                fillMapList();
+            }
+        } else {
+            mFirstPass = true;
+        }
     }
 }
 
@@ -120,16 +201,16 @@ void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
         if (mCursor > 0)
             mCursor--;
         else
-            mCursor = getOpenRaider().mMapList.size() - 1;
+            mCursor = mMapList.size() - 1;
     } else if (key == downKey) {
-        if (mCursor < (getOpenRaider().mMapList.size() - 1))
+        if (mCursor < (mMapList.size() - 1))
             mCursor++;
         else
             mCursor = 0;
     } else if (key == rightKey) {
         int i = 10;
-        if (mCursor > (getOpenRaider().mMapList.size() - 11))
-            i = getOpenRaider().mMapList.size() - 1 - mCursor;
+        if (mCursor > (mMapList.size() - 11))
+            i = mMapList.size() - 1 - mCursor;
         while (i-- > 0)
             handleKeyboard(downKey, true);
     } else if (key == leftKey) {
@@ -139,7 +220,7 @@ void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
         while (i-- > 0)
             handleKeyboard(upKey, true);
     } else if (key == enterKey) {
-        char *tmp = bufferString("load %s", getOpenRaider().mMapList[mCursor]);
+        char *tmp = bufferString("load %s", mMapList[mCursor]);
         if (getOpenRaider().command(tmp) == 0) {
             setVisible(false);
         } else {

src/OpenRaider.cpp

@@ -8,7 +8,6 @@
 #include <cstdio>
 #include <cstring>
 #include <assert.h>
-#include <dirent.h>
 
 #include "WindowSDL.h"
 
@@ -31,7 +30,6 @@ OpenRaider::OpenRaider() {
     mPakDir = NULL;
     mAudioDir = NULL;
     mDataDir = NULL;
-    mMapListFilled = false;
 
     for (int i = 0; i < ActionEventCount; i++)
         keyBindings[i] = unknownKey;
@@ -49,11 +47,6 @@ OpenRaider::~OpenRaider() {
 
     if (mDataDir)
         delete mDataDir;
-
-    while (mMapList.size() > 0) {
-        delete [] mMapList.back();
-        mMapList.pop_back();
-    }
 }
 
 int OpenRaider::initialize() {
@@ -90,6 +83,10 @@ int OpenRaider::initialize() {
         return -5;
     }
 
+#ifdef DEBUG
+    mFPS = true;
+#endif
+
     getMenu().setVisible(true);
     systemTimerReset();
 
@@ -1070,69 +1067,6 @@ int OpenRaider::bind(ActionEvents action, const char *key) {
     return 0;
 }
 
-void OpenRaider::loadPakFolderRecursive(const char *dir) {
-    struct dirent entry;
-    struct dirent *ep = NULL;
-    DIR *pakDir;
-
-    assert(dir != NULL);
-    assert(dir[0] != '\0');
-    assert(mRunning == true);
-
-    pakDir = opendir(dir);
-    if (pakDir != NULL) {
-        readdir_r(pakDir, &entry, &ep);
-        while (ep != 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 {
-                char *fullPathMap = bufferString("%s%s", dir, ep->d_name);
-
-                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(mPakDir) + 1)));
-                    } else {
-                        getConsole().print("Error: pak file '%s' %s",
-                                fullPathMap, (error == -1) ? "not found" : "invalid");
-                    }
-                }
-
-                delete [] lowerPath;
-                delete [] fullPathMap;
-            }
-            readdir_r(pakDir, &entry, &ep);
-        }
-        closedir(pakDir);
-    } else {
-        getConsole().print("Could not open PAK dir %s!", dir);
-    }
-}
-
-void OpenRaider::fillMapList() {
-    assert(mRunning == true);
-
-    char *tmp = fullPath(mPakDir, '/');
-    loadPakFolderRecursive(tmp);
-    delete [] tmp;
-    mMapListFilled = true;
-}
-
 void OpenRaider::run() {
     assert(mRunning == false);
 
@@ -1169,16 +1103,21 @@ void OpenRaider::frame() {
     if (mFPS)
         getWindow().drawText(10, getWindow().mHeight - 20, 0.5f, OR_BLUE, "%dFPS", fps);
 
+#ifdef DEBUG
+    // Draw debug infos
+    if (getGame().isLoaded()) {
+        for (int i = 0; i < 3; i++) {
+            getWindow().drawText(10, getWindow().mHeight - ((4 - i) * 20), 0.5f, OR_BLUE, "%.2f (%.2f)",
+                getGame().mLara->pos[i] / 256.0f, getGame().mLara->angles[i]);
+        }
+    }
+#endif
+
     getWindow().glExit2D();
 
     // Put new frame on screen
     getWindow().swapBuffersGL();
 
-    // Fill map list after first render pass,
-    // so menu *loading screen* is visible
-    if (!mMapListFilled)
-        fillMapList();
-
     // Calculate FPS display value
     fpsCount++;
     fpsSum += (systemTimerGet() - startTime);

src/Render.cpp

@@ -408,11 +408,6 @@ void Render::display()
     RenderRoom *room;
     int index;
 
-
-#ifdef DEBUG_MATRIX
-    gl_test_reset();
-#endif
-
     switch (mMode)
     {
         case Render::modeDisabled:
@@ -638,14 +633,6 @@ void Render::display()
     if (mMode == Render::modeWireframe)
         glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 
-    // Mongoose 2002.01.01, Test matrix ops
-#ifdef DEBUG_MATRIX
-    if (gl_test_val())
-    {
-        printf("ERROR in matrix stack %i\n", gl_test_val());
-    }
-#endif
-
     glFlush();
 }
 
@@ -965,7 +952,7 @@ void Render::drawModel(SkeletalModel *model)
 
     if (animation->frame.empty())
     {
-#ifdef DEBUG_RENDER
+#ifdef DEBUG
         printf("ERROR: No boneframes?!?!  *** %i:%i ***\n",
                 mdl->id, bframe);
 #endif

src/World.cpp

@@ -209,41 +209,9 @@ bool World::isWall(int room, int sector) {
 bool World::getHeightAtPosition(int index, float x, float *y, float z)
 {
     room_mesh_t *room = mRooms[index];
-
-#ifdef OBSOLETE_USING_BOXES
-    unsigned int i;
-    float zmax, xmax, zmin, xmin;
-
-
-    if (!room)
-    {
-        return false;
-    }
-
-    // Mongoose 2002.08.14, It's 0302 - give me a fucking break --
-    //   this works albeit poorly  =)
-    for (i = 0; (int)i < room->num_boxes; ++i)
-    {
-        xmax = room->boxes[i].c.pos[0];
-        xmin = room->boxes[i].a.pos[0];
-        zmax = room->boxes[i].c.pos[2];
-        zmin = room->boxes[i].a.pos[2];
-
-        if (x < xmax && x > xmin && z < zmax && z > zmin)
-        {
-            //printf("%f %f %f %f\n", xmax, xmin, zmax, zmin);
-
-            *y =  room->boxes[i].a.pos[1]; // hhmm...room->pos[1] +
-            return true;
-        }
-    }
-
-    return false;
-#else
     int sector;
     sector_t *sect;
 
-
     if (!room)
     {
         return false;
@@ -262,7 +230,6 @@ bool World::getHeightAtPosition(int index, float x, float *y, float z)
     *y = sect->floor;
 
     return true;
-#endif
 }
 
 
@@ -300,10 +267,6 @@ std::vector<room_mesh_t *> *World::getRooms()
 #endif
 
 
-////////////////////////////////////////////////////////////
-// Public Mutators
-////////////////////////////////////////////////////////////
-
 void World::setFlag(WorldFlag flag)
 {
     mFlags |= flag;
@@ -575,22 +538,9 @@ void World::moveEntity(entity_t *e, char movement)
 
     if (room == -1) // Will we hit a portal?
     {
-#define ADJ_ROOM_CHECK
-#ifdef ADJ_ROOM_CHECK
         room = getAdjoiningRoom(e->room,
                 e->pos[0],  e->pos[1], e->pos[2],
                 x, y, z);
-#else
-        if (!(mFlags & fEnableHopping))
-        {
-            mFlags |= fEnableHopping;
-            room = getRoomByLocation(e->room, x, y, z);
-            printf("Hopped\n");
-            mFlags ^= fEnableHopping;
-        }
-
-        //room = getRoomByLocation(x, y, z);
-#endif
 
         if (room > -1)
         {
@@ -660,16 +610,6 @@ void World::moveEntity(entity_t *e, char movement)
         {
             case worldMoveType_fly:
             case worldMoveType_swim:
-#ifdef DIVE_GAP
-                // Clips to top of water, waiting for DIVE event
-                if (h < floor)
-                    e->pos[1] = floor;
-                else if (h > ceiling)
-                    e->pos[1] = ceiling;
-                else
-                    e->pos[1] = y;
-#endif
-
                 // Don't fall out of world, avoid a movement that does
                 if (h > y - camHeight)
                 {
@@ -704,13 +644,6 @@ void World::moveEntity(entity_t *e, char movement)
                 e->pos[1] = y;
                 e->pos[2] = z;
         }
-
-#ifdef OBSOLETE
-        m_text->SetString(1,"Room %2i  Sector %2i %sPos %.0f %.0f %.0f Yaw %.0f",
-                room, sector,
-                wall ? " Wall " : " ",
-                e->pos[0], e->pos[1], e->pos[2], e->angles[1]);
-#endif
     }
     else
     {
@@ -722,14 +655,3 @@ void World::moveEntity(entity_t *e, char movement)
     e->moving = true;
 }
 
-
-////////////////////////////////////////////////////////////
-// Private Accessors
-////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////
-// Private Mutators
-////////////////////////////////////////////////////////////
-
-