World|Map: Cleanup

skyjake · Oct 11, 2013 · 1d7f6c0 · 1d7f6c0
1 parent 104d96c
commit 1d7f6c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/doomsday/client/include/world/map.h b/doomsday/client/include/world/map.h
@@ -482,6 +482,13 @@ class Map
     int linePathIterator(Vector2d const &from, Vector2d const &to, int flags,
         int (*callback) (Line *line, void *context), void *context = 0) const;
 
+    /// @copydoc linePathIterator()
+    inline int linePathIterator(Vector2d const &from, Vector2d const &to,
+        int (*callback) (Line *line, void *context), void *context = 0) const
+    {
+        return linePathIterator(from, to, LIF_ALL, callback, context);
+    }
+
     int bspLeafBoxIterator(AABoxd const &box, Sector *sector,
         int (*callback) (BspLeaf *bspLeaf, void *context), void *context = 0) const;
 

diff --git a/doomsday/client/src/world/api_map.cpp b/doomsday/client/src/world/api_map.cpp
@@ -43,9 +43,9 @@
 #include "world/world.h"
 #include "BspLeaf"
 
+#include "render/r_main.h" // validCount
 #ifdef __CLIENT__
 #  include "render/lightgrid.h"
-#  include "render/r_main.h" // validCount
 #endif
 
 using namespace de;
@@ -1730,7 +1730,7 @@ static int traverseMapPath(Map &map, Vector2d const &from, Vector2d const &to,
     // Step #1: Collect intercepts.
     if(flags & PT_ADDLINES)
     {
-        map.linePathIterator(from, to, LIF_ALL, collectCellLineInterceptsWorker, &traceLine);
+        map.linePathIterator(from, to, collectCellLineInterceptsWorker, &traceLine);
     }
     if(flags & PT_ADDMOBJS)
     {