projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
offscreen.patch by Klaus Denker: correct some calculations
[supertux.git]
/
src
/
game_session.cpp
diff --git
a/src/game_session.cpp
b/src/game_session.cpp
index
809311c
..
5caed2e
100644
(file)
--- 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)
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
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);
if(level->on_menukey_script != "") {
std::istringstream in(level->on_menukey_script);