Allow Start controller button to be used to press on menu buttons.

DreamyCecil · Sep 14, 2024 · 5466b8b · 5466b8b
1 parent d3e0c59
commit 5466b8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Sources/SeriousSam/GUI/Menus/Menu.h b/Sources/SeriousSam/GUI/Menus/Menu.h
@@ -37,7 +37,7 @@ struct PressedMenuButton {
   // Apply / Enter the next menu
   inline bool Apply(void) {
     return iKey == SE1K_RETURN || iMouse == SDL_BUTTON_LEFT
-        || iCtrl == SDL_CONTROLLER_BUTTON_A;
+        || iCtrl == SDL_CONTROLLER_BUTTON_A || iCtrl == SDL_CONTROLLER_BUTTON_START;
   };
 
   // Decrease value

diff --git a/Sources/SeriousSam/SeriousSam.cpp b/Sources/SeriousSam/SeriousSam.cpp
@@ -1076,7 +1076,9 @@ int SubMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, const CTString &strCm
       // If currently in the menu and wanting to return to the previous menu
       } else if (bMenuForced && bMenuToggle && pgmCurrentMenu->gm_pgmParentMenu == NULL) {
         // Delete key down message because there's no previous menu
-        event.type = WM_NULL;
+        if (event.type != WM_CTRLBUTTONDOWN) {
+          event.type = WM_NULL;
+        }
       }
 
       // Quick-open specific menus