Now segfaults somwhere else in Render

src/Game.cpp

@@ -132,8 +132,9 @@ int Game::loadLevel(const char *level) {
         processRoom(i);
     printf("Done! Found %d rooms.\n", mTombRaider.NumRooms());
     printf("Processing meshes: ");
-    for (int i = 0; i < mTombRaider.getMeshCount(); i++)
+    for (int i = 0; i < mTombRaider.getMeshCount(); i++) {
         processModel(i);
+    }
     printf("Done! Found %d meshes.\n", mTombRaider.getMeshCount());
     processSprites();
     processMoveables();
@@ -633,7 +634,7 @@ void Game::processMoveable(int index, int i, int *ent,
             break;
         }
     }
-    if (cache.empty() || (!found))
+    if (!found)
     {
         sModel->model = r_model;
         mWorld.addEntity(thing);
@@ -892,19 +893,14 @@ void Game::processMoveable(int index, int i, int *ent,
     //fflush(stdout);
 }
 
-int compareFaceTextureId(const void *voidA, const void *voidB)
+bool compareFaceTextureId(const void *voidA, const void *voidB)
 {
     texture_tri_t *a = (texture_tri_t *)voidA, *b = (texture_tri_t *)voidB;
 
     if (!a || !b)
-        return -1; // error really
-
-    // less than
-    if (a->texture < b->texture)
-        return -1;
+        return false; // error really
 
-    // greater than ( no need for equal )
-    return 1;
+    return (a->texture < b->texture);
 }
 
 #ifdef EXPERIMENTAL

src/Render.cpp

@@ -112,13 +112,13 @@ void Render::drawLoadScreen()
 }
 
 
-int compareEntites(const void *voidA, const void *voidB)
+bool compareEntites(const void *voidA, const void *voidB)
 {
     entity_t *a = (entity_t *)voidA, *b = (entity_t *)voidB;
     vec_t distA, distB;
 
     if (!a || !b)
-        return -1; // error really
+        return false; // error really
 
     distA = gViewVolume.getDistToSphereFromNear(a->pos[0],
             a->pos[1],
@@ -129,22 +129,17 @@ int compareEntites(const void *voidA, const void *voidB)
             b->pos[2],
             1.0f);
 
-    // less than
-    if (distA < distB)
-        return -1;
-
-    // greater than ( no need for equal )
-    return 1;
+    return (distA < distB);
 }
 
 
-int compareStaticModels(const void *voidA, const void *voidB)
+bool compareStaticModels(const void *voidA, const void *voidB)
 {
     static_model_t *a = (static_model_t *)voidA, *b = (static_model_t *)voidB;
     vec_t distA, distB;
 
     if (!a || !b)
-        return -1; // error really
+        return false; // error really
 
     distA = gViewVolume.getDistToSphereFromNear(a->pos[0],
             a->pos[1],
@@ -155,30 +150,20 @@ int compareStaticModels(const void *voidA, const void *voidB)
             b->pos[2],
             128.0f);
 
-    // less than
-    if (distA < distB)
-        return -1;
-
-    // greater than ( no need for equal )
-    return 1;
+    return (distA < distB);
 }
 
 
-int compareRoomDist(const void *voidA, const void *voidB)
+bool compareRoomDist(const void *voidA, const void *voidB)
 {
     const RenderRoom *a = static_cast<const RenderRoom *>(voidA);
     const RenderRoom *b = static_cast<const RenderRoom *>(voidB);
 
 
     if (!a || !b || !a->room || !b->room)
-        return -1; // error really
-
-    // less than
-    if (a->dist < b->dist)
-        return -1;
+        return false; // error really
 
-    // greater than ( no need for equal )
-    return 1;
+    return (a->dist < b->dist);
 }
 
 

src/World.cpp

@@ -121,7 +121,6 @@ int World::getSector(int room, float x, float z, float *floor, float *ceiling)
     sector_t * s;
     int sector;
 
-
     r = mRooms[room];
 
     if (!r)
@@ -150,7 +149,6 @@ int World::getSector(int room, float x, float z)
     int sector;
     room_mesh_t *r;
 
-
     r = mRooms[room];
 
     if (!r)