enhancement: press enter key to select character to play (#2328)

AscensionGameDev · Jul 17, 2024 · 7b524eb · 7b524eb
1 parent a5df1c7
commit 7b524eb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/Intersect.Client/Core/Input.cs b/Intersect.Client/Core/Input.cs
@@ -210,6 +210,20 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                             break;
 
                         case GameStates.Menu:
+                            var selectCharacterWindow = Interface.Interface.MenuUi.MainMenu.mSelectCharacterWindow;
+
+                            switch (control)
+                            {
+                                case Control.Enter:
+                                    if (!selectCharacterWindow.IsHidden && selectCharacterWindow.Characters[selectCharacterWindow.mSelectedChar] != null)
+                                    {
+                                        selectCharacterWindow.PlayButton_Clicked(null, null);
+                                        consumeKey = true;
+                                    }
+
+                                    break;
+                            }
+
                             break;
 
                         case GameStates.InGame:

diff --git a/Intersect.Client/Interface/Menu/MainMenu.cs b/Intersect.Client/Interface/Menu/MainMenu.cs
@@ -43,7 +43,7 @@ public static void HandleReceivedConfiguration()
 
     private readonly ResetPasswordWindow mResetPasswordWindow;
 
-    private readonly SelectCharacterWindow mSelectCharacterWindow;
+    public readonly SelectCharacterWindow mSelectCharacterWindow;
 
     //Character creation feild check
     private bool mHasMadeCharacterCreation;

diff --git a/Intersect.Client/Interface/Menu/SelectCharacterWindow.cs b/Intersect.Client/Interface/Menu/SelectCharacterWindow.cs
@@ -51,7 +51,7 @@ public partial class SelectCharacterWindow
     private Button mPrevCharButton;
 
     //Selected Char
-    private int mSelectedChar = 0;
+    public int mSelectedChar = 0;
 
     //Init
     public SelectCharacterWindow(Canvas parent, MainMenu mainMenu)
@@ -88,7 +88,7 @@ public SelectCharacterWindow(Canvas parent, MainMenu mainMenu)
         //Play Button
         mPlayButton = new Button(mCharacterSelectionPanel, "PlayButton");
         mPlayButton.SetText(Strings.CharacterSelection.Play);
-        mPlayButton.Clicked += _playButton_Clicked;
+        mPlayButton.Clicked += PlayButton_Clicked;
         mPlayButton.Hide();
 
         //Delete Button
@@ -366,7 +366,7 @@ private void _nextCharButton_Clicked(Base sender, ClickedEventArgs arguments)
         UpdateDisplay();
     }
 
-    private void _playButton_Clicked(Base sender, ClickedEventArgs arguments)
+    public void PlayButton_Clicked(Base? sender, ClickedEventArgs? arguments)
     {
         if (Globals.WaitingOnServer)
         {