From 5825474e9ffc00632aaf3b757f3ecf158f6b003e Mon Sep 17 00:00:00 2001 From: Ricardo Cruz Date: Fri, 9 Jul 2004 10:38:58 +0000 Subject: [PATCH] Fixed aborting behavior. SVN-Revision: 1550 --- src/title.cpp | 2 +- src/worldmap.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/title.cpp b/src/title.cpp index 0f60981c9..b348a4669 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -305,6 +305,7 @@ void title(void) leveleditor->run(); delete leveleditor; Menu::set_current(main_menu); + update_time = st_get_ticks(); break; case MNID_CREDITS: display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS); @@ -336,7 +337,6 @@ void title(void) update_load_save_game_menu(load_game_menu); Menu::set_current(main_menu); - update_time = st_get_ticks(); } else if (process_load_game_menu()) { diff --git a/src/worldmap.cpp b/src/worldmap.cpp index a9e49ae56..c12218435 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -707,8 +707,11 @@ WorldMap::update(float delta) break; case GameSession::ES_LEVEL_ABORT: /* In case the player's abort the level, keep it using the old - status */ - player_status = old_player_status; + status. But the minimum lives and no bonus. */ + player_status.score = old_player_status.score; + player_status.distros = old_player_status.distros; + player_status.lives = std::min(old_player_status.lives, player_status.lives); + player_status.bonus = player_status.NO_BONUS; break; case GameSession::ES_GAME_OVER: { -- 2.11.0