TODO update

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 26d23dc..a2046d2 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -150,6 +150,7 @@ void check_contrib_subset_menu()
           std::cout << "Sarting level: " << index << std::endl;
           GameSession session(current_contrib_subset, index, ST_GL_PLAY);
           session.run();
+          player_status.reset();
           Menu::set_current(main_menu);
         }
     }  
@@ -211,7 +212,7 @@ void draw_demo(GameSession* session, double frame_ratio)
       random_timer.start(rand() % 3000 + 3000);
       walking = !walking;
     }
-  
+
   // Wrap around at the end of the level back to the beginnig
   if(plevel->width * 32 - 320 < tux->base.x)
     {
@@ -219,13 +220,17 @@ void draw_demo(GameSession* session, double frame_ratio)
       scroll_x = tux->base.x - 320;
     }
 
+  tux->can_jump = true;
   float last_tux_x_pos = tux->base.x;
   tux->action(frame_ratio);
 
+  // disabled for now, since with the new jump code we easily get deadlocks
   // Jump if tux stays in the same position for one loop, ie. if he is
   // stuck behind a wall
   if (last_tux_x_pos == tux->base.x)
-    walking = false;
+    {
+      walking = false;
+    }
 
   tux->draw();
 }
@@ -343,7 +348,6 @@ void title(void)
                 char str[1024];
                 sprintf(str,"Are you sure you want to delete slot %d?", slot);
                 
-                Menu::set_current(0);
                 draw_background();
 
                 if(confirm_dialog(str))
@@ -353,8 +357,8 @@ void title(void)
                   remove(str);
                   }
 
+                update_load_save_game_menu(load_game_menu);
                 update_time = st_get_ticks();
-                Menu::set_current(main_menu);
                 }
               else if (process_load_game_menu())
                 {