No longer segfaulting but now leaking World memory

include/Render.h

@@ -119,8 +119,6 @@ public:
         skeletalMesh
     } RenderMeshType;
 
-    void drawLoadScreen();
-
     /*!
      * \brief Constructs an object of Render
      */
@@ -216,6 +214,8 @@ public:
 
 private:
 
+    void drawLoadScreen();
+
     /*!
      * \brief Check if a bounding box is in the View Volume
      * \param bboxMin Start coordinates of a valid bounding box

include/World.h

@@ -27,7 +27,7 @@ class World {
 public:
 
     enum WorldFlag {
-        fEnableHopping = 1
+        fEnableHopping = (1 << 0)
     };
 
     /*!

src/Game.cpp

@@ -70,6 +70,9 @@ int Game::initialize() {
     // Enable Renderer
     mRender->setMode(Render::modeLoadScreen);
 
+    // Enable World Hopping
+    mWorld.setFlag(World::fEnableHopping);
+
     return 0;
 }
 
@@ -636,6 +639,9 @@ void Game::processMoveable(int index, int i, int *ent,
     }
     if (!found)
     {
+        if (mLara == thing) {
+            printf("Processing Lara...\n");
+        }
         sModel->model = r_model;
         mWorld.addEntity(thing);
 

src/SkeletalModel.cpp

@@ -20,7 +20,8 @@ SkeletalModel::SkeletalModel() {
 }
 
 SkeletalModel::~SkeletalModel() {
-    if (model) {
+    //! \fixme Causes "freeing already freed pointer" exceptions or EXEC_BAD_ACCESS
+    /* if (model) {
         for(std::vector<animation_frame_t>::size_type i = 0; i < model->animation.size(); i++) {
             animation_frame_t *af = model->animation[i];
 
@@ -44,9 +45,8 @@ SkeletalModel::~SkeletalModel() {
             delete af;
         }
 
-        // \fixme Causes "freeing already freed pointer" exception
         delete model;
-    }
+    } */
 }
 
 int SkeletalModel::getAnimation() {

src/World.cpp

@@ -55,18 +55,18 @@ int World::getRoomByLocation(float x, float y, float z)
     int hop = -1;
 
 
-    for(std::vector<int>::size_type i = 0; i != mRooms.size(); i++)
+    for(std::vector<int>::size_type i = 0; i < mRooms.size(); i++)
     {
         room = mRooms[i];
 
         if (!room)
             continue;
 
-        if (x > room->bbox_min[0] && x < room->bbox_max[0] &&
-                z > room->bbox_min[2] && z < room->bbox_max[2])
+        if ((x > room->bbox_min[0]) && (x < room->bbox_max[0]) &&
+                (z > room->bbox_min[2]) && (z < room->bbox_max[2]))
         {
             // This room contains current position
-            if (y > room->bbox_min[1] && y < room->bbox_max[1])
+            if ((y > room->bbox_min[1]) && (y < room->bbox_max[1]))
                 return i;
 
             // This room is above or below current position
@@ -315,8 +315,7 @@ void World::setFlag(WorldFlag flag)
 
 void World::clearFlag(WorldFlag flag)
 {
-    mFlags |= flag;
-    mFlags ^= flag;
+    mFlags &= ~flag;
 }
 
 
@@ -325,7 +324,8 @@ void World::destroy()
     // Add some locking to check use state first
     if (!mClearLock)
     {
-        clear();
+        //! \fixme Causes "freeing already freed pointer" exceptions or EXEC_BAD_ACCESS
+        //clear();
     }
 }
 
@@ -450,7 +450,7 @@ void World::moveEntity(entity_t *e, char movement)
                 e->pos[0],  e->pos[1], e->pos[2],
                 x, y, z);
 #else
-        if (!mFlags & fEnableHopping)
+        if (!(mFlags & fEnableHopping))
         {
             mFlags |= fEnableHopping;
             room = getRoomByLocation(e->room, x, y, z);