From: Wolfgang Becker <uafr@gmx.de>
Date: Sat, 16 Dec 2006 13:54:47 +0000 (+0000)
Subject: allow-esc-out-of-sequence.patch by Odin Omdal Hørthe
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=476a6df55846fd802a203a244f2fb307079c402e;p=supertux.git

allow-esc-out-of-sequence.patch by Odin Omdal Hørthe

SVN-Revision: 4461
---

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);