Support clicking to open doors

ethanmoffat · Sep 16, 2022 · 3dcda22 · 3dcda22
1 parent 02bb182
commit 3dcda22
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/EOLib/Domain/Map/MapActions.cs b/EOLib/Domain/Map/MapActions.cs
@@ -51,6 +51,9 @@ public ItemPickupResult PickUpItem(MapItem item)
 
         public void OpenDoor(Warp warp)
         {
+            if (_currentMapStateRepository.PendingDoors.Contains(warp))
+                return;
+
             var packet = new PacketBuilder(PacketFamily.Door, PacketAction.Open)
                 .AddChar((byte)warp.X)
                 .AddChar((byte)warp.Y)

diff --git a/EndlessClient/Controllers/MapInteractionController.cs b/EndlessClient/Controllers/MapInteractionController.cs
@@ -162,6 +162,16 @@ public void LeftClick(IMapCellState cellState, Option<IMouseCursorRenderer> mous
                 _userInputRepository.ClickHandled = true;
             }
 
+            cellState.Warp.MatchSome(w =>
+            {
+                w.SomeWhen(d => d.DoorType != DoorSpec.NoDoor)
+                    .MatchSome(d =>
+                    {
+                        _mapActions.OpenDoor(d);
+                        _userInputRepository.ClickHandled = true;
+                    });
+            });
+
             _userInputTimeRepository.LastInputTime = DateTime.Now;
         }
 

diff --git a/EndlessClient/Rendering/MouseCursorRenderer.cs b/EndlessClient/Rendering/MouseCursorRenderer.cs
@@ -300,9 +300,7 @@ private void CheckForClicks(IMapCellState cellState)
             var currentMouseState = _userInputProvider.CurrentMouseState;
             var previousMouseState = _userInputProvider.PreviousMouseState;
 
-            // todo: some left clicks should be on the graphic itself instead of based on the grid where the cursor is (map sign, board, etc.)
-            if (currentMouseState.LeftButton == ButtonState.Released &&
-                previousMouseState.LeftButton == ButtonState.Pressed)
+            if (currentMouseState.LeftButton == ButtonState.Released && previousMouseState.LeftButton == ButtonState.Pressed)
             {
                 _mapInteractionController.LeftClick(cellState, Option.Some<IMouseCursorRenderer>(this));
             }