No need to bother with function pointers for drawing anymore, really.

world.c

@@ -237,8 +237,6 @@ static void world_drawFacesTextured(const world_t *world, const ps1bsp_face_t *f
     draw_texwindow(prevTexWin, curOT);
 }
 
-static void (*world_drawFaces)(const world_t *world, const ps1bsp_face_t *firstFace) = &world_drawFacesTextured;
-
 // Simplified BSP subtree traversal specifically for sorting faces of brush models.
 // This skips the frustum culling and PVS culling stages, as this will have already been done on the leafs containing the model.
 static ps1bsp_face_t *world_sortModelFaces(const world_t* world, const ps1bsp_model_t* model, u_long frameNum, ps1bsp_face_t **lastFace)
@@ -505,9 +503,7 @@ void world_draw(const world_t *world)
     ps1bsp_face_t *firstFace = world_sortFaces(world, firstLeaf);
 
     if (enableTexturing)
-        world_drawFaces = &world_drawFacesTextured;
+        world_drawFacesTextured(world, firstFace);
     else
-        world_drawFaces = &world_drawFacesLit;
-
-    world_drawFaces(world, firstFace);
+        world_drawFacesLit(world, firstFace);
 }