[Super-tux-commit] supertux/src title.cpp,1.99,1.100 worldmap.cpp,1.89,1.90

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1197/src

Modified Files:
	title.cpp worldmap.cpp 
Log Message:
Fixed aborting behavior.

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- title.cpp	23 Jun 2004 10:17:25 -0000	1.99
+++ title.cpp	9 Jul 2004 10:38:58 -0000	1.100
@@ -305,6 +305,7 @@
                   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 @@
 
                 update_load_save_game_menu(load_game_menu);
                 Menu::set_current(main_menu);
-                update_time = st_get_ticks();
                 }
               else if (process_load_game_menu())
                 {

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- worldmap.cpp	8 Jul 2004 10:11:08 -0000	1.89
+++ worldmap.cpp	9 Jul 2004 10:38:58 -0000	1.90
@@ -707,8 +707,11 @@
                   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:
                 {