fixed pathfinding module

Author: HexDecimal

build_libtcod.py

@@ -527,6 +527,41 @@ def _get_library_crossplatform():
 void TCOD_noise_delete(TCOD_noise_t noise);
 
 
+// PATH
+
+typedef float (*TCOD_path_func_t)( int xFrom, int yFrom, int xTo, int yTo, void *user_data );
+typedef void *TCOD_path_t;
+
+TCOD_path_t TCOD_path_new_using_map(TCOD_map_t map, float diagonalCost);
+TCOD_path_t TCOD_path_new_using_function(int map_width, int map_height, TCOD_path_func_t func, void *user_data, float diagonalCost);
+
+bool TCOD_path_compute(TCOD_path_t path, int ox,int oy, int dx, int dy);
+bool TCOD_path_walk(TCOD_path_t path, int *x, int *y, bool recalculate_when_needed);
+bool TCOD_path_is_empty(TCOD_path_t path);
+int TCOD_path_size(TCOD_path_t path);
+void TCOD_path_reverse(TCOD_path_t path);
+void TCOD_path_get(TCOD_path_t path, int index, int *x, int *y);
+void TCOD_path_get_origin(TCOD_path_t path, int *x, int *y);
+void TCOD_path_get_destination(TCOD_path_t path, int *x, int *y);
+void TCOD_path_delete(TCOD_path_t path);
+
+/* Dijkstra stuff - by Mingos*/
+
+typedef void *TCOD_dijkstra_t;
+
+TCOD_dijkstra_t TCOD_dijkstra_new (TCOD_map_t map, float diagonalCost);
+TCOD_dijkstra_t TCOD_dijkstra_new_using_function(int map_width, int map_height, TCOD_path_func_t func, void *user_data, float diagonalCost);
+void TCOD_dijkstra_compute (TCOD_dijkstra_t dijkstra, int root_x, int root_y);
+float TCOD_dijkstra_get_distance (TCOD_dijkstra_t dijkstra, int x, int y);
+bool TCOD_dijkstra_path_set (TCOD_dijkstra_t dijkstra, int x, int y);
+bool TCOD_dijkstra_is_empty(TCOD_dijkstra_t path);
+int TCOD_dijkstra_size(TCOD_dijkstra_t path);
+void TCOD_dijkstra_reverse(TCOD_dijkstra_t path);
+void TCOD_dijkstra_get(TCOD_dijkstra_t path, int index, int *x, int *y);
+bool TCOD_dijkstra_path_walk (TCOD_dijkstra_t dijkstra, int *x, int *y);
+void TCOD_dijkstra_delete (TCOD_dijkstra_t dijkstra);
+
+
 // CUSTOM FUNCTONS
 
 void set_char(TCOD_console_t console, int x, int y,

tdl/map.py

@@ -34,7 +34,7 @@ class AStar(object):
 
     __slots__ = ('_as_parameter_', '_callback', '__weakref__')
 
-    _create_callback = _ffi.callback('float(int, int, int, int, void*)')
+    
 
     def __init__(self, width, height, callback,
                  diagnalCost=_math.sqrt(2), advanced=False):
@@ -91,15 +91,15 @@ def newCallback(sourceX, sourceY, destX, destY, null):
                 if pathCost:
                     return pathCost
                 return 0.0
-        self._callback = self._create_callback(newCallback)
+        self._callback = _ffi.callback('TCOD_path_func_t')(newCallback)
         """A cffi callback to be kept in memory."""
 
         self._as_parameter_ = _lib.TCOD_path_new_using_function(width, height,
                                      self._callback, _ffi.NULL, diagnalCost)
 
     def __del__(self):
         if self._as_parameter_:
-            _lib.TCOD_path_delete(self)
+            _lib.TCOD_path_delete(self._as_parameter_)
             self._as_parameter_ = None
 
     def getPath(self, origX, origY, destX, destY):
@@ -112,13 +112,13 @@ def getPath(self, origX, origY, destX, destY):
                  
                  If no path is found then an empty list is returned.
         """
-        found = _lib.TCOD_path_compute(self, origX, origY, destX, destY)
+        found = _lib.TCOD_path_compute(self._as_parameter_, origX, origY, destX, destY)
         if not found:
             return [] # path not found
         x, y = _ffi.new('int *'), _ffi.new('int *')
-        recalculate = _ffi.new('bool *', True)
+        recalculate = True
         path = []
-        while _lib.TCOD_path_walk(self, x, y, recalculate):
+        while _lib.TCOD_path_walk(self._as_parameter_, x, y, recalculate):
             path.append((x[0], y[0]))
         return path