From 5e956da74e494a9fa34373ab42bd47312bc1e9f2 Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Mon, 3 May 2004 12:39:19 +0000 Subject: [PATCH] fix timeup issues when endsequence triggered SVN-Revision: 940 --- src/gameloop.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/gameloop.cpp b/src/gameloop.cpp index c09dbba24..252c69b30 100644 --- a/src/gameloop.cpp +++ b/src/gameloop.cpp @@ -611,7 +611,8 @@ GameSession::run() } /* Handle time: */ - if (!time_left.check() && world->get_tux()->dying == DYING_NOT) + if (!time_left.check() && world->get_tux()->dying == DYING_NOT + && !end_sequence) world->get_tux()->kill(Player::KILL); /* Handle music: */ @@ -671,12 +672,14 @@ GameSession::drawstatus() white_text->draw("Press ESC To Return",0,20,1); } - if(!time_left.check()) { - white_text->draw("TIME'S UP", 224, 0, 1); - } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) { - sprintf(str, "%d", time_left.get_left() / 1000 ); - white_text->draw("TIME", 224, 0, 1); - gold_text->draw(str, 304, 0, 1); + if(!end_sequence) { + if(!time_left.check()) { + white_text->draw("TIME'S UP", 224, 0, 1); + } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) { + sprintf(str, "%d", time_left.get_left() / 1000 ); + white_text->draw("TIME", 224, 0, 1); + gold_text->draw(str, 304, 0, 1); + } } sprintf(str, "%d", player_status.distros); -- 2.11.0