Don't handle mouse click if clicking outside the map bounds

ethanmoffat · Jan 23, 2021 · 5aa6581 · 5aa6581
1 parent 163ba88
commit 5aa6581
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/EOLib/Domain/Map/IMapCellState.cs b/EOLib/Domain/Map/IMapCellState.cs
@@ -7,6 +7,8 @@ namespace EOLib.Domain.Map
 {
     public interface IMapCellState
     {
+        bool InBounds { get; }
+
         MapCoordinate Coordinate { get;  }
 
         IReadOnlyList<IItem> Items { get; }

diff --git a/EOLib/Domain/Map/MapCellState.cs b/EOLib/Domain/Map/MapCellState.cs
@@ -7,6 +7,8 @@ namespace EOLib.Domain.Map
 {
     public class MapCellState : IMapCellState
     {
+        public bool InBounds { get; set; }
+
         public MapCoordinate Coordinate { get; set; }
 
         public IReadOnlyList<IItem> Items { get; set; }

diff --git a/EOLib/Domain/Map/MapCellStateProvider.cs b/EOLib/Domain/Map/MapCellStateProvider.cs
@@ -28,7 +28,7 @@ public class MapCellStateProvider : IMapCellStateProvider
         public IMapCellState GetCellStateAt(int x, int y)
         {
             if (x < 0 || y < 0 || x > CurrentMap.Properties.Width || y > CurrentMap.Properties.Height)
-                return new MapCellState {TileSpec = TileSpec.MapEdge};
+                return new MapCellState { InBounds = false, TileSpec = TileSpec.MapEdge };
 
             var tileSpec = CurrentMap.Tiles[y, x];
             var warp = CurrentMap.Warps[y, x];
@@ -42,6 +42,7 @@ public IMapCellState GetCellStateAt(int x, int y)
 
             return new MapCellState
             {
+                InBounds   = true,
                 Coordinate = new MapCoordinate(x, y),
                 Items      = items.ToList(),
                 TileSpec   = tileSpec,

diff --git a/EndlessClient/Controllers/MapInteractionController.cs b/EndlessClient/Controllers/MapInteractionController.cs
@@ -49,7 +49,7 @@ public void LeftClick(IMapCellState cellState, IMouseCursorRenderer mouseRendere
             else if (cellState.Sign.HasValue) { /* TODO: sign interaction */ }
             else if (cellState.Chest.HasValue) { /* TODO: chest interaction */ }
             else if (cellState.Character.HasValue) { /* TODO: character spell cast */ }
-            else
+            else if (cellState.InBounds)
             {
                 mouseRenderer.AnimateClick();
                 _hudControlProvider.GetComponent<IClickWalkPathHandler>(HudControlIdentifier.ClickWalkPathHandler)