Plug in pathfinder

src/fheroes2/world/world.cpp

@@ -1037,6 +1037,11 @@ u32 World::GetUniq( void )
     return ++GameStatic::uniq;
 }
 
+std::list<Route::Step> World::getPath( int from, int to, uint32_t skill, bool ignoreObjects )
+{
+    return _pathfinder.buildPath( from, to, ignoreObjects );
+}
+
 StreamBase & operator<<( StreamBase & msg, const CapturedObject & obj )
 {
     return msg << obj.objcol << obj.guardians << obj.split;

src/fheroes2/world/world.h

@@ -34,6 +34,7 @@
 #include "maps_tiles.h"
 #include "sprite.h"
 #include "week.h"
+#include "world_pathfinding.h"
 #include <string>
 
 class Heroes;
@@ -251,6 +252,8 @@ class World : protected Size
     MapObjectSimple * GetMapObject( u32 uid );
     void RemoveMapObject( const MapObjectSimple * );
 
+    std::list<Route::Step> getPath( int from, int to, uint32_t skill, bool ignoreObjects = true );
+
     static u32 GetUniq( void );
 
     void PostFixLoad( void );
@@ -295,6 +298,7 @@ class World : protected Size
 
     MapActions map_actions;
     MapObjects map_objects;
+    Pathfinder _pathfinder;
 };
 
 StreamBase & operator<<( StreamBase &, const CapturedObject & );

src/fheroes2/world/world_pathfinding.cpp

@@ -56,9 +56,9 @@ namespace
     }
 }
 
-void Pathfinder::buildPath( int from, int target, bool ignoreObjects )
+std::list<Route::Step> Pathfinder::buildPath( int from, int target, bool ignoreObjects )
 {
-    std::vector<int> path;
+    std::list<Route::Step> path;
 
     // check if we have to re-cache the map (new hero selected, etc)
     if ( _pathStart != from ) {
@@ -67,10 +67,15 @@ void Pathfinder::buildPath( int from, int target, bool ignoreObjects )
 
     // trace the path from end point
     int currentNode = target;
+    uint32_t cost = _cache[currentNode]._cost;
     while ( currentNode != from && currentNode != -1 ) {
-        path.push_back( currentNode );
-        currentNode = _cache[currentNode]._from;
+        PathfindingNode & node = _cache[currentNode];
+        path.push_front( { node._from, Direction::Get( node._from, currentNode ), cost - node._cost } );
+        currentNode = node._from;
+        cost = node._cost;
     }
+
+    return path;
 }
 
 void Pathfinder::evaluateMap( int start, uint32_t skillLevel )

src/fheroes2/world/world_pathfinding.h

@@ -18,7 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "world.h"
+#pragma once
+
+#include "route.h"
 
 namespace
 {
@@ -33,28 +35,28 @@ namespace
         BOTTOM_LEFT = 6,
         LEFT = 7
     };
+}
 
-    struct PathfindingNode
-    {
-        int _from = -1;
-        uint32_t _cost = 0;
+struct PathfindingNode
+{
+    int _from = -1;
+    uint32_t _cost = 0;
 
-        PathfindingNode() {}
-        PathfindingNode( int node, uint32_t cost )
-            : _from( node )
-            , _cost( cost )
-        {}
-    };
+    PathfindingNode() {}
+    PathfindingNode( int node, uint32_t cost )
+        : _from( node )
+        , _cost( cost )
+    {}
+};
 
-    class Pathfinder
-    {
-    public:
-        Pathfinder() {}
-        void evaluateMap( int start, uint32_t skillLevel = 0 );
-        void buildPath( int from, int target, bool ignoreObjects = true );
+class Pathfinder
+{
+public:
+    Pathfinder() {}
+    void evaluateMap( int start, uint32_t skillLevel = 0 );
+    std::list<Route::Step> buildPath( int from, int target, bool ignoreObjects = true );
 
-    private:
-        std::vector<PathfindingNode> _cache;
-        int _pathStart = -1;
-    };
-}
+private:
+    std::vector<PathfindingNode> _cache;
+    int _pathStart = -1;
+};