diff --git a/src/landscape.cpp b/src/landscape.cpp
index 411eb514d8..916201615d 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -1217,7 +1217,7 @@ struct River_UserData {
 };
 
 /* AyStar callback for checking whether we reached our destination. */
-static int32_t River_EndNodeCheck(const AyStar *aystar, const PathNode *current)
+static AyStarStatus River_EndNodeCheck(const AyStar *aystar, const PathNode *current)
 {
 	return current->GetTile() == *(TileIndex*)aystar->user_target ? AYSTAR_FOUND_END_NODE : AYSTAR_DONE;
 }
diff --git a/src/pathfinder/aystar.h b/src/pathfinder/aystar.h
index 033e488d65..1e94bfa02d 100644
--- a/src/pathfinder/aystar.h
+++ b/src/pathfinder/aystar.h
@@ -62,7 +62,7 @@ struct AyStar;
  *  - #AYSTAR_FOUND_END_NODE : indicates this is the end tile
  *  - #AYSTAR_DONE : indicates this is not the end tile (or direction was wrong)
  */
-typedef int32_t AyStar_EndNodeCheck(const AyStar *aystar, const PathNode *current);
+typedef AyStarStatus AyStar_EndNodeCheck(const AyStar *aystar, const PathNode *current);
 
 /**
  * Calculate the G-value for the %AyStar algorithm.