X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.cpp;h=5caed2e23e78fb5ec94b545ba605c21b0fffd6af;hb=339968d0eb222f5cad1397580631ab44acf40b10;hp=809311cf879c5feb4cc9d1c2e7f3d2b6f1626190;hpb=657c6c73aa3fcd0676f425c4edd31dd1e893469d;p=supertux.git 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);