From 476a6df55846fd802a203a244f2fb307079c402e Mon Sep 17 00:00:00 2001 From: Wolfgang Becker Date: Sat, 16 Dec 2006 13:54:47 +0000 Subject: [PATCH] =?utf8?q?allow-esc-out-of-sequence.patch=20by=20Odin=20Om?= =?utf8?q?dal=20H=C3=B8rthe?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit SVN-Revision: 4461 --- src/game_session.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/game_session.cpp b/src/game_session.cpp index 809311cf8..5caed2e23 100644 --- a/src/game_session.cpp +++ b/src/game_session.cpp @@ -272,7 +272,12 @@ void GameSession::on_escape_press() { if(currentsector->player->is_dying() || end_sequence != NO_ENDSEQUENCE) + { + // Let the timers run out, we fast-forward them to force past a sequence + endsequence_timer.start(FLT_EPSILON); + currentsector->player->dying_timer.start(FLT_EPSILON); return; // don't let the player open the menu, when he is dying + } if(level->on_menukey_script != "") { std::istringstream in(level->on_menukey_script); -- 2.11.0