Merge pull request #78379 from Procyonae/DebugOptionRemoveQuitQuery

Remove y/n prompts for save quitting and quitting from the main menu
CleverRaven · Dec 14, 2024 · 852bc73 · 852bc73
2 parents 45999cb + f464be9
commit 852bc73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/handle_action.cpp b/src/handle_action.cpp
@@ -2820,11 +2820,9 @@ bool game::do_regular_action( action_id &act, avatar &player_character,
             break;
 
         case ACTION_SAVE:
-            if( query_yn( _( "Save and quit?" ) ) ) {
-                if( save() ) {
-                    player_character.set_moves( 0 );
-                    uquit = QUIT_SAVED;
-                }
+            if( save() ) {
+                player_character.set_moves( 0 );
+                uquit = QUIT_SAVED;
             }
             break;
 

diff --git a/src/main_menu.cpp b/src/main_menu.cpp
@@ -884,12 +884,8 @@ bool main_menu::opening_screen()
         // also check special keys
         if( action == "QUIT" ) {
 #if !defined(EMSCRIPTEN)
-            g->uquit = QUIT_EXIT_PENDING;
-            if( query_yn( _( "Really quit?" ) ) ) {
-                g->uquit = QUIT_EXIT;
-                return false;
-            }
-            g->uquit = QUIT_NO;
+            g->uquit = QUIT_EXIT;
+            return false;
 #endif
         } else if( action == "LEFT" || action == "PREV_TAB" || action == "RIGHT" || action == "NEXT_TAB" ) {
             sel_line = 0;