Engine: fixed unintended int->uint cast in MaskRouteFinder

This fixes negative coordinates overflow.
adventuregamestudio · Oct 7, 2024 · cbbaeb5 · cbbaeb5
1 parent 35dcccc
commit cbbaeb5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Engine/ac/route_finder.cpp b/Engine/ac/route_finder.cpp
@@ -63,11 +63,11 @@ bool MaskRouteFinder::FindRoute(std::vector<Point> &path, int srcx, int srcy, in
     return true;
 }
 
-void MaskRouteFinder::SetWalkableArea(const AGS::Common::Bitmap *walkablearea, uint32_t coord_scale)
+void MaskRouteFinder::SetWalkableArea(const AGS::Common::Bitmap *walkablearea, int coord_scale)
 {
     _walkablearea = walkablearea;
     assert(coord_scale > 0);
-    _coordScale = std::max(1u, coord_scale);
+    _coordScale = std::max(1, coord_scale);
     OnSetWalkableArea();
 }
 

diff --git a/Engine/ac/route_finder.h b/Engine/ac/route_finder.h
@@ -63,7 +63,7 @@ class MaskRouteFinder : public IRouteFinder
     // Assign a walkable mask, and an optional coordinate scale factor which will be used
     // to convert (divide) input coordinates, and resulting path back (multiply).
     // Note that this may make routefinder to generate additional data, taking more time.
-    void SetWalkableArea(const AGS::Common::Bitmap *walkablearea, uint32_t coord_scale = 1);
+    void SetWalkableArea(const AGS::Common::Bitmap *walkablearea, int coord_scale = 1);
 
 protected:
     // Update the implementation after a new walkable area is set
@@ -75,7 +75,7 @@ class MaskRouteFinder : public IRouteFinder
         bool exact_dest, bool ignore_walls) = 0;
 
     const Common::Bitmap *_walkablearea = nullptr;
-    uint32_t _coordScale = 1;
+    int _coordScale = 1;
 };