Included supertux.h stuff into it.

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 6b86242..10b7c4c 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -46,7 +46,7 @@ static texture_type logo;
 static texture_type img_choose_subset;
 
 static bool walking;
-static timer_type random_timer;
+static Timer random_timer;
 
 static SDL_Event event;
 static SDLKey key;
@@ -146,7 +146,6 @@ bool title(void)
   st_pause_ticks_init();
 
   GameSession session(datadir + "/levels/misc/menu.stl");
-  loadshared();
 
   //FIXME:activate_particle_systems();
 
@@ -188,7 +187,7 @@ bool title(void)
 
       while (SDL_PollEvent(&event))
         {
-          menu_event(event);
+          current_menu->event(event);
           if (event.type == SDL_QUIT)
             {
               done = true;
@@ -327,8 +326,11 @@ bool title(void)
               // Contrib Menu
               break;
             case 3:
-              done = 1;
+              done = true;
               done = leveleditor(1);
+              menu_reset();
+              show_menu = 1;
+              Menu::set_current(main_menu);
               break;
             case 4:
               display_credits();
@@ -389,7 +391,7 @@ void display_credits()
 {
   int done;
   int scroll, speed;
-  timer_type timer;
+  Timer timer;
   int n,d;
   int length;
   FILE* fi;