Repository navigation
Add a controller-accessible Quit option to the Gameplay menu - #1255
Merged
Merged
Conversation
Assisted-by: OpenAI Codex Co-Authored-By: OpenAI Codex <codex@openai.com>
…t-menu # Conflicts: # gpu/vk/vk_menu.cpp # host/posix/display_sdl.c
Review of NotRexed#1255: the window's own close (rx_close_asked, then hos_window_closed_exit) does not force the pipeline cache, so Quit now calls save() and pipeline_cache_save(true) before posting WM_CLOSE, as the restart question's Restart now does. A comment by the table says Quit and Cheats stay its last two rows, since kQuitRow and kCheatsRow count back from its end (rows[] is not constexpr, so a static_assert on the name cannot check it). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Contributor
Author
|
Thanks for the review! Both points are in a7b27de:
Re-tested on CachyOS (RTX 5060, Hyprland) with a virtual Xbox Series controller, on a build of main a1c4bcd plus this branch. The menu tests pass ( About the Restart option you asked for: I'll send it as a separate PR, since CONTRIBUTING asks for one topic per pull request. It will reuse the same confirm step and the restart question's Restart now path ( |
Contributor
Author
|
The Restart option is now #1266. It is built on this branch, and only its last commit is new. |
wyatt-poole
added a commit
to wyatt-poole/Hookshot
that referenced
this pull request
Nov 10, 2026
Conflicts in gpu/vk/vk_menu.cpp with main's Audio output row (NotRexed#1240) and the Restart/Quit confirm (NotRexed#1266, NotRexed#1255): tx_deadzone and tx_audio_output both kept; Esc on the Motion page goes back before the pending confirm is cancelled; the Motion row opens its page after the Cheats row's test in main's confirm chain. TAB_MOTION is now TAB_COUNT itself (one past the strip), and tab_selected is sized by it, so a tab added before TAB_COUNT (NotRexed#1270) moves the Motion page along instead of colliding. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BsKC8mjbyEUFAv6uy3SQiW
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add a Quit row to the Insert menu's Gameplay tab. The first activation shows Confirm. A second activation closes the game through the normal window-close path. B or Esc cancels the confirmation. The same action is available with Enter and mouse clicks.
This addresses the in-menu exit requested in #1203 and tracked in #1007.
Validation
Assisted by OpenAI Codex.