AttackDistanceHint to SetShootBorders param

cvet · Dec 13, 2024 · 3b18a29 · 3b18a29
1 parent 8f4b9fe
commit 3b18a29
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Source/Client/MapView.cpp b/Source/Client/MapView.cpp
@@ -2928,7 +2928,7 @@ void MapView::PrepareFogToDraw()
             int hx = base_hx;
             int hy = base_hy;
             const int chosen_dir = chosen->GetDir();
-            const auto dist_shoot = chosen->GetAttackDistanceHint();
+            const auto dist_shoot = _shootBordersDist;
             const auto half_hw = _engine->Settings.MapHexWidth / 2;
             const auto half_hh = _engine->Settings.MapHexHeight / 2;
 
@@ -4466,12 +4466,13 @@ void MapView::FindSetCenter(int cx, int cy)
     RebuildMap(hx, hy);
 }
 
-void MapView::SetShootBorders(bool enabled)
+void MapView::SetShootBorders(bool enabled, uint dist)
 {
     STACK_TRACE_ENTRY();
 
     if (_drawShootBorders != enabled) {
         _drawShootBorders = enabled;
+        _shootBordersDist = dist;
         RebuildFog();
     }
 }

diff --git a/Source/Client/MapView.h b/Source/Client/MapView.h
@@ -214,7 +214,7 @@ class MapView final : public ClientEntity, public EntityWithProto, public MapPro
     void RebuildMapOffset(int ox, int oy);
     void RefreshMap() { RebuildMap(_screenHexX, _screenHexY); }
     void RebuildFog() { _rebuildFog = true; }
-    void SetShootBorders(bool enabled);
+    void SetShootBorders(bool enabled, uint dist);
     auto MeasureMapBorders(const Sprite* spr, int ox, int oy) -> bool;
     auto MeasureMapBorders(const ItemHexView* item) -> bool;
     void RecacheHexFlags(uint16 hx, uint16 hy);
@@ -405,6 +405,7 @@ class MapView final : public ClientEntity, public EntityWithProto, public MapPro
     bool _rebuildFog {};
     bool _drawLookBorders {true};
     bool _drawShootBorders {};
+    uint _shootBordersDist {};
     vector<PrimitivePoint> _fogLookPoints {};
     vector<PrimitivePoint> _fogShootPoints {};
 

diff --git a/Source/Common/EntityProperties.h b/Source/Common/EntityProperties.h
@@ -361,8 +361,6 @@ class CritterProperties : public EntityProperties
     ///@ ExportProperty
     ENTITY_PROPERTY(Protected, uint, LookDistance);
     ///@ ExportProperty
-    ENTITY_PROPERTY(PrivateClient, uint, AttackDistanceHint);
-    ///@ ExportProperty
     ENTITY_PROPERTY(Public, uint, TalkDistance);
     ///@ ExportProperty
     ENTITY_PROPERTY(PrivateServer, uint, MaxTalkers);

diff --git a/Source/Scripting/ClientMapScriptMethods.cpp b/Source/Scripting/ClientMapScriptMethods.cpp
@@ -738,9 +738,9 @@
 }
 
 ///@ ExportMethod
-[[maybe_unused]] void Client_Map_SetShootBorders(MapView* self, bool enabled)
+[[maybe_unused]] void Client_Map_SetShootBorders(MapView* self, bool enabled, uint dist)
 {
-    self->SetShootBorders(enabled);
+    self->SetShootBorders(enabled, dist);
 }
 
 ///@ ExportMethod