Merge pull request #651 from Wargus/pathfinding

Pathfinding
Wargus · Apr 6, 2024 · 15fb3b5 · 15fb3b5
2 parents f5467c6 + 5dc5ea4
commit 15fb3b5
Show file tree

Hide file tree

Showing 9 changed files with 263 additions and 112 deletions.
diff --git a/src/action/action_move.cpp b/src/action/action_move.cpp
@@ -173,7 +173,7 @@ int DoActionMove(CUnit &unit)
 		}
 
 		UnmarkUnitFieldFlags(unit);
-		d = NextPathElement(unit, &posd.x, &posd.y);
+		d = NextPathElement(unit, &posd);
 		MarkUnitFieldFlags(unit);
 		switch (d) {
 			case PF_UNREACHABLE: // Can't reach, stop

diff --git a/src/include/actions.h b/src/include/actions.h
@@ -35,6 +35,9 @@
 #include "unitptr.h"
 #include "vec2i.h"
 
+#include <memory>
+#include <string_view>
+
 /*----------------------------------------------------------------------------
 --  Declarations
 ----------------------------------------------------------------------------*/

diff --git a/src/include/pathfinder.h b/src/include/pathfinder.h
@@ -32,6 +32,7 @@
 
 //@{
 
+void DrawLastAStar(const class CViewport &vp);
 #if defined(DEBUG_ASTAR)
 #define AstarDebugPrint(format, ...) DebugPrint(format, ##__VA_ARGS__)
 #else
@@ -225,7 +226,7 @@ extern void InitPathfinder();
 extern void FreePathfinder();
 
 /// Returns the next element of the path
-extern int NextPathElement(CUnit &unit, short int *xdp, short int *ydp);
+extern int NextPathElement(CUnit &unit, Vec2i *dir);
 /// Return path length to unit 'dst'.
 extern int UnitReachable(const CUnit &src, const CUnit &dst, int range, bool from_outside_container);
 /// Return path length to unit 'dst' or error code.

diff --git a/src/include/tile.h b/src/include/tile.h
@@ -180,7 +180,7 @@ class CMapFieldPlayerInfo
 class CMapField
 {
 public:
-	CMapField();
+	CMapField() = default;
 
 	void Save(CFile &file) const;
 	void parse(lua_State *l);
@@ -231,30 +231,29 @@ class CMapField
 	unsigned int getFlag() const { return Flags; }
 	void setGraphicTile(unsigned int tile) { this->tile = tile; }
 #ifdef DEBUG
-	int64_t lastAStarCost;    /// debugging pathfinder
+	int64_t lastAStarCost = 0;    /// debugging pathfinder
 #endif
 
 	uint8_t getElevation() const { return this->ElevationLevel; }
-	void 	setElevation(const uint8_t newLevel) { this->ElevationLevel = newLevel; }
+	void setElevation(const uint8_t newLevel) { this->ElevationLevel = newLevel; }
 
 private:
 #ifdef DEBUG
-	tile_index tilesetTile;  /// tileset tile number
+	tile_index tilesetTile = 0;  /// tileset tile number
 #endif
-	graphic_index tile;       /// graphic tile number
+	graphic_index tile = 0;      /// graphic tile number
 public:
-	tile_flags Flags;        /// field flags
+	tile_flags Flags = 0;        /// field flags
 private:
-	unsigned char cost;        /// unit cost to move in this tile
+	unsigned char cost = 0;      /// unit cost to move in this tile
 public:
-	unsigned int Value;        /// HP for walls/Wood Regeneration, value of stored resource for forest or harvestable terrain
+	unsigned int Value = 0;         /// HP for walls/Wood Regeneration, value of stored resource for forest or harvestable terrain
 	std::vector<CUnit *> UnitCache; /// A unit on the map field.
 
 	CMapFieldPlayerInfo playerInfo; /// stuff related to player
 
 private:
-	uint8_t ElevationLevel {0};		/// highground elevation level
-
+	uint8_t ElevationLevel {0}; /// highground elevation level
 };
 
 extern PixelSize PixelTileSize; /// Size of a tile in pixels

diff --git a/src/map/map_draw.cpp b/src/map/map_draw.cpp
@@ -346,6 +346,7 @@ void CViewport::DrawMapBackgroundInViewport(const fieldHighlightChecker highligh
 					}
 				}
 			}
+			DrawLastAStar(*this);
 #endif
 			/// Highlight layer if needed (editor stuff)
 			if (highlightChecker && highlightChecker(mf)) {

diff --git a/src/map/mapfield.cpp b/src/map/mapfield.cpp
@@ -46,17 +46,6 @@
 #include "unit.h"
 #include "unit_manager.h"
 
-CMapField::CMapField() :
-#ifdef DEBUG
-	tilesetTile(0),
-#endif
-	tile(0),
-	Flags(0),
-	cost(0),
-	Value(0),
-	UnitCache()
-{}
-
 bool CMapField::IsTerrainResourceOnMap(int resource) const
 {
 	switch (resource) {