From 3db11493e461dfd1c9cd6530c9b5adc92e9a4152 Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Tue, 13 Mar 2018 22:10:46 -0400 Subject: [PATCH] back out pause changes for now --- src/freespace2/freespace.cpp | 4 ++-- src/osapi/osapi.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/freespace2/freespace.cpp b/src/freespace2/freespace.cpp index a775088..a6263bf 100644 --- a/src/freespace2/freespace.cpp +++ b/src/freespace2/freespace.cpp @@ -5528,9 +5528,9 @@ void game_leave_state( int old_state, int new_state ) case GS_STATE_GAME_PAUSED: game_start_time(); - // if (end_mission) { + if (end_mission) { pause_close(0); - // } + } break; case GS_STATE_DEBUG_PAUSED: diff --git a/src/osapi/osapi.cpp b/src/osapi/osapi.cpp index eefef85..58abf01 100644 --- a/src/osapi/osapi.cpp +++ b/src/osapi/osapi.cpp @@ -364,7 +364,7 @@ void os_poll() // minimize window: CTRL+ALT+z else if ( (e.key.keysym.sym == SDLK_z) && (e.key.keysym.mod & (KMOD_CTRL | KMOD_ALT)) ) { if ( !e.key.repeat ) { - SDL_MinimizeWindow(Os_window); + // SDL_MinimizeWindow(Os_window); } } // print screen / screenshot: CTRL+ALT+p @@ -484,9 +484,9 @@ void os_poll() mouse_grab(0); joy_unacquire_ff(); // make sure game pauses - game_process_pause_key(); + // game_process_pause_key(); // graphics - gr_activate(fAppActive); + // gr_activate(fAppActive); break; case SDL_WINDOWEVENT_MAXIMIZED: @@ -496,12 +496,12 @@ void os_poll() mouse_grab(0); joy_reacquire_ff(); // graphics - gr_activate(fAppActive); + // gr_activate(fAppActive); break; } case SDL_WINDOWEVENT_CLOSE: - gameseq_post_event(GS_EVENT_QUIT_GAME); + // gameseq_post_event(GS_EVENT_QUIT_GAME); break; } -- 2.39.2