X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=a187aeaad9705fdad5d510f6030b5ecebbc907b5;hb=43db9a6c44b6ee544e7694d1bb234ba559b0849c;hp=e5e5aa58d3efbc8ccf2184ca6f6c53b2c75ef915;hpb=9e5732a3c816561abfa93882860eb4a3e8e104c1;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index e5e5aa58d..a187aeaad 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -1,8 +1,8 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
 //  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -13,7 +13,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -26,15 +26,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 #include <errno.h>
 #include <unistd.h>
-#include <cmath>
 #include <SDL.h>
 #include <SDL_image.h>
 #include <physfs.h>
+#include <algorithm>
 
+#include "gameconfig.hpp"
 #include "title.hpp"
-#include "video/screen.hpp"
+#include "mainloop.hpp"
+#include "video/drawing_context.hpp"
 #include "video/surface.hpp"
 #include "audio/sound_manager.hpp"
 #include "gui/menu.hpp"
@@ -42,9 +45,9 @@
 #include "lisp/lisp.hpp"
 #include "lisp/parser.hpp"
 #include "level.hpp"
-#include "level_subset.hpp"
+#include "world.hpp"
 #include "game_session.hpp"
-#include "worldmap.hpp"
+#include "worldmap/worldmap.hpp"
 #include "player_status.hpp"
 #include "tile.hpp"
 #include "sector.hpp"
@@ -53,98 +56,76 @@
 #include "object/player.hpp"
 #include "resources.hpp"
 #include "gettext.hpp"
-#include "misc.hpp"
 #include "textscroller.hpp"
+#include "fadeout.hpp"
 #include "file_system.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
 #include "control/codecontroller.hpp"
 #include "main.hpp"
-#include "exceptions.hpp"
-#include "msg.hpp"
+#include "log.hpp"
+#include "options_menu.hpp"
 #include "console.hpp"
-
-static Surface* bkg_title;
-static Surface* logo;
-//static Surface* img_choose_subset;
-
-static int frame;
-
-static GameSession* titlesession;
-static CodeController* controller;
-
-static std::vector<LevelSubset*> contrib_subsets;
-static LevelSubset* current_contrib_subset = 0;
-static int current_subset = -1;
-
-static Console* console;
-
-/* If the demo was stopped - because game started, level
-   editor was excuted, etc - call this when you get back
-   to the title code.
- */
-void resume_demo()
+#include "random_generator.hpp"
+#include "addon/addon_manager.hpp"
+
+enum MainMenuIDs {
+  MNID_STARTGAME,
+  MNID_LEVELS_CONTRIB,
+  MNID_ADDONS,
+  MNID_OPTIONMENU,
+  MNID_LEVELEDITOR,
+  MNID_CREDITS,
+  MNID_QUITMAINMENU
+};
+
+void
+TitleScreen::update_load_game_menu()
 {
-  player_status->reset();
-  titlesession->get_current_sector()->activate("main");
-  titlesession->set_current();
-
-  //frame_rate.update();
 }
 
-void update_load_save_game_menu(Menu* menu)
+void
+TitleScreen::free_contrib_menu()
 {
-  msg_debug("update loadsavemenu");
-  for(int i = 1; i < 6; ++i) {
-    MenuItem& item = menu->get_item_by_id(i);
-    item.kind = MN_ACTION;
-    item.change_text(slotinfo(i));
-  }
-}
-
-void free_contrib_menu()
-{
-  for(std::vector<LevelSubset*>::iterator i = contrib_subsets.begin();
-      i != contrib_subsets.end(); ++i)
+  for(std::vector<World*>::iterator i = contrib_worlds.begin();
+      i != contrib_worlds.end(); ++i)
     delete *i;
 
-  contrib_subsets.clear();
-  contrib_menu->clear();
-  current_contrib_subset = 0;
-  current_subset = -1;
+  contrib_worlds.clear();
 }
 
-void generate_contrib_menu()
+void
+TitleScreen::generate_contrib_menu()
 {
   /** Generating contrib levels list by making use of Level Subset  */
-  std::vector<std::string> level_subsets; 
+  std::vector<std::string> level_worlds;
   char** files = PHYSFS_enumerateFiles("levels/");
   for(const char* const* filename = files; *filename != 0; ++filename) {
     std::string filepath = std::string("levels/") + *filename;
     if(PHYSFS_isDirectory(filepath.c_str()))
-      level_subsets.push_back(filepath);
+      level_worlds.push_back(filepath);
   }
   PHYSFS_freeList(files);
 
   free_contrib_menu();
+  contrib_menu.reset(new Menu());
 
   contrib_menu->add_label(_("Contrib Levels"));
   contrib_menu->add_hl();
-  
+
   int i = 0;
-  for (std::vector<std::string>::iterator it = level_subsets.begin();
-      it != level_subsets.end(); ++it) {
+  for (std::vector<std::string>::iterator it = level_worlds.begin();
+      it != level_worlds.end(); ++it) {
     try {
-      std::auto_ptr<LevelSubset> subset (new LevelSubset());
-      subset->load(*it);
-      if(subset->hide_from_contribs) {
+      std::auto_ptr<World> world (new World());
+      world->load(*it + "/info");
+      if(world->hide_from_contribs) {
         continue;
       }
-      contrib_menu->add_submenu(subset->title, contrib_subset_menu, i++);
-      contrib_subsets.push_back(subset.release());
+      contrib_menu->add_entry(i++, world->title);
+      contrib_worlds.push_back(world.release());
     } catch(std::exception& e) {
 #ifdef DEBUG
-      msg_warning("Couldn't parse levelset info for '"
-        << *it << "': " << e.what() << "");
+      log_warning << "Couldn't parse levelset info for '" << *it << "': " << e.what() << std::endl;
 #endif
     }
   }
@@ -153,11 +134,12 @@ void generate_contrib_menu()
   contrib_menu->add_back(_("Back"));
 }
 
-std::string get_level_name(const std::string& filename)
+std::string
+TitleScreen::get_level_name(const std::string& filename)
 {
   try {
     lisp::Parser parser;
-    std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+    const lisp::Lisp* root = parser.parse(filename);
 
     const lisp::Lisp* level = root->get_lisp("supertux-level");
     if(!level)
@@ -167,300 +149,342 @@ std::string get_level_name(const std::string& filename)
     level->get("name", name);
     return name;
   } catch(std::exception& e) {
-    msg_warning("Problem getting name of '" << filename << "'.");
+      log_warning << "Problem getting name of '" << filename << "': "
+                  << e.what() << std::endl;
     return "";
   }
 }
 
-void check_levels_contrib_menu()
+void
+TitleScreen::check_levels_contrib_menu()
 {
   int index = contrib_menu->check();
   if (index == -1)
     return;
 
-  LevelSubset& subset = * (contrib_subsets[index]);
-  
-  if(subset.has_worldmap) {
-    WorldMapNS::WorldMap worldmap;
-    worldmap.set_map_filename(subset.get_worldmap_filename());
-    sound_manager->stop_music();
-
-    // some fading
-    fadeout(256);
-    DrawingContext context;
-    context.draw_text(white_text, "Loading...",
-        Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT/2), CENTER_ALLIGN, LAYER_FOREGROUND1);
-    context.do_drawing();
-
-    // TODO: slots should be available for contrib maps
-    worldmap.loadgame("save/" + subset.name + "-slot1.stsg");
-    worldmap.display();  // run the map
+  current_world = contrib_worlds[index];
 
-    Menu::set_current(main_menu);
-    resume_demo();
-  } else if (current_subset != index) {
-    current_subset = index;
-    LevelSubset& subset = * (contrib_subsets[index]);
+  if(!current_world->is_levelset) {
+    start_game();
+  } else {
+    contrib_world_menu.reset(new Menu());
 
-    current_contrib_subset = &subset;
+    contrib_world_menu->add_label(current_world->title);
+    contrib_world_menu->add_hl();
 
-    contrib_subset_menu->clear();
-
-    contrib_subset_menu->add_label(subset.title);
-    contrib_subset_menu->add_hl();
-
-    for (int i = 0; i < subset.get_num_levels(); ++i)
+    for (unsigned int i = 0; i < current_world->get_num_levels(); ++i)
     {
       /** get level's title */
-      std::string filename = subset.get_level_filename(i);
+      std::string filename = current_world->get_level_filename(i);
       std::string title = get_level_name(filename);
-      contrib_subset_menu->add_entry(i, title);
+      contrib_world_menu->add_entry(i, title);
     }
 
-    contrib_subset_menu->add_hl();
-    contrib_subset_menu->add_back(_("Back"));
+    contrib_world_menu->add_hl();
+    contrib_world_menu->add_back(_("Back"));
 
-    titlesession->get_current_sector()->activate("main");
-    titlesession->set_current();
+    Menu::push_current(contrib_world_menu.get());
   }
 }
 
-void check_contrib_subset_menu()
+void
+TitleScreen::check_contrib_world_menu()
 {
-  int index = contrib_subset_menu->check();
+  int index = contrib_world_menu->check();
   if (index != -1) {
-    if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION) {
+    if (contrib_world_menu->get_item_by_id(index).kind == MN_ACTION) {
       sound_manager->stop_music();
-      GameSession session(
-          current_contrib_subset->get_level_filename(index), ST_GL_PLAY);
-      session.run();
-      player_status->reset();
-      Menu::set_current(main_menu);
-      resume_demo();
+      GameSession* session =
+        new GameSession(current_world->get_level_filename(index));
+      main_loop->push_screen(session);
+    }
+  }
+}
+
+namespace {
+  bool generate_addons_menu_sorter(const Addon* a1, const Addon* a2)
+  {
+    return a1->title < a2->title;
+  }
+
+  const int ADDON_LIST_START_ID = 10;
+}
+
+void
+TitleScreen::generate_addons_menu()
+{
+  AddonManager& adm = AddonManager::get_instance();
+
+  // refresh list of addons
+  addons = adm.get_addons();
+  
+  // sort list
+  std::sort(addons.begin(), addons.end(), generate_addons_menu_sorter);
+
+  // (re)generate menu
+  free_addons_menu();
+  addons_menu.reset(new Menu());
+
+  addons_menu->add_label(_("Add-ons"));
+  addons_menu->add_hl();
+  
+#ifdef HAVE_LIBCURL
+  addons_menu->add_entry(0, std::string(_("Check Online")));
+#else
+  addons_menu->add_inactive(0, std::string(_("Check Online (disabled)")));
+#endif
+
+  //addons_menu->add_hl();
+
+  for (unsigned int i = 0; i < addons.size(); i++) {
+    const Addon& addon = *addons[i];
+    std::string text = "";
+    if (addon.kind != "") text += addon.kind + " ";
+    text += std::string("\"") + addon.title + "\"";
+    if (addon.author != "") text += " by \"" + addon.author + "\"";
+    addons_menu->add_toggle(ADDON_LIST_START_ID + i, text, addon.loaded);
+  }
+
+  addons_menu->add_hl();
+  addons_menu->add_back(_("Back"));
+}
+
+void
+TitleScreen::check_addons_menu()
+{
+  int index = addons_menu->check();
+  if (index == -1) return;
+
+  // check if "Check Online" was chosen
+  if (index == 0) {
+    try {
+      AddonManager::get_instance().check_online();
+      generate_addons_menu();
+      Menu::set_current(addons_menu.get());
+      addons_menu->set_active_item(index);
+    } 
+    catch (std::runtime_error e) {
+      log_warning << "Check for available Add-ons failed: " << e.what() << std::endl;
+    }
+    return;
+  }
+
+  // if one of the Addons listed was chosen, take appropriate action
+  if ((index >= ADDON_LIST_START_ID) && (index < ADDON_LIST_START_ID) + addons.size()) {
+    Addon& addon = *addons[index - ADDON_LIST_START_ID];
+    if (!addon.installed) {
+      try {
+        AddonManager::get_instance().install(&addon);
+      } 
+      catch (std::runtime_error e) {
+        log_warning << "Installing Add-on failed: " << e.what() << std::endl;
+      }
+      addons_menu->set_toggled(index, addon.loaded);
+    } else if (!addon.loaded) {
+      try {
+        AddonManager::get_instance().enable(&addon);
+      } 
+      catch (std::runtime_error e) {
+        log_warning << "Enabling Add-on failed: " << e.what() << std::endl;
+      }
+      addons_menu->set_toggled(index, addon.loaded);
+    } else {
+      try {
+        AddonManager::get_instance().disable(&addon);
+      } 
+      catch (std::runtime_error e) {
+        log_warning << "Disabling Add-on failed: " << e.what() << std::endl;
+      }
+      addons_menu->set_toggled(index, addon.loaded);
     }
-  }  
+  }
 }
 
-void draw_demo(float elapsed_time)
+void
+TitleScreen::free_addons_menu()
 {
-  static Timer randomWaitTimer;
-  static Timer jumpPushTimer;
-  static Timer jumpRecoverTimer;
-  static float last_tux_x_pos = -1;
-  static float last_tux_y_pos = -1;
+}
 
+void
+TitleScreen::make_tux_jump()
+{
+  static bool jumpWasReleased = true;
   Sector* sector  = titlesession->get_current_sector();
   Player* tux = sector->player;
 
-  sector->play_music(LEVEL_MUSIC);
-
   controller->update();
   controller->press(Controller::RIGHT);
 
-  // Determine how far we moved since last frame
-  float dx = fabsf(last_tux_x_pos - tux->get_pos().x); 
-  float dy = fabsf(last_tux_y_pos - tux->get_pos().y); 
- 
-  // Calculate space to check for obstacles 
-  Rect lookahead = Rect(tux->get_bbox());
-  lookahead.move(Vector(lookahead.get_width()*2,0));
-  
   // Check if we should press the jump button
-  bool randomJump = !randomWaitTimer.started();
-  bool mayJump = !jumpRecoverTimer.started();
-  bool notMoving = (dx+dy < 0.1);
-  bool pathBlocked = !sector->is_free_space(lookahead); 
-  if ((notMoving || pathBlocked || randomJump) && mayJump) {
-    float jumpDuration = float(rand() % 200 + 500) / 1000.0;
-    jumpPushTimer.start(jumpDuration);
-    jumpRecoverTimer.start(jumpDuration+0.1);
-    randomWaitTimer.start(float(rand() % 3000 + 3000) / 1000.0);
+  Rect lookahead = tux->get_bbox();
+  lookahead.p2.x += 96;
+  bool pathBlocked = !sector->is_free_of_statics(lookahead);
+  if ((pathBlocked && jumpWasReleased) || !tux->on_ground()) {
+    controller->press(Controller::JUMP);
+    jumpWasReleased = false;
+  } else {
+    jumpWasReleased = true;
   }
 
-  // Keep jump button pressed
-  if (jumpPushTimer.started()) controller->press(Controller::JUMP);
-
-  // Remember last position, so we can determine if we moved
-  last_tux_x_pos = tux->get_pos().x;
-  last_tux_y_pos = tux->get_pos().y;
-
-  // Wrap around at the end of the level back to the beginnig
-  if(sector->solids->get_width() * 32 - 320 < tux->get_pos().x) {
+  // Wrap around at the end of the level back to the beginning
+  if(sector->get_width() - 320 < tux->get_pos().x) {
     sector->activate("main");
     sector->camera->reset(tux->get_pos());
   }
+}
 
-  sector->update(elapsed_time);
-  sector->draw(*titlesession->context);
+TitleScreen::TitleScreen()
+{
+  controller.reset(new CodeController());
+  titlesession.reset(new GameSession("levels/misc/menu.stl"));
+
+  Player* player = titlesession->get_current_sector()->player;
+  player->set_controller(controller.get());
+  player->set_speedlimit(230); //MAX_WALK_XM
+
+  generate_main_menu();
+
+  frame = std::auto_ptr<Surface>(new Surface("images/engine/menu/frame.png"));
 }
 
-/* --- TITLE SCREEN --- */
-void title()
+void
+TitleScreen::generate_main_menu()
 {
-  //LevelEditor* leveleditor;
-  controller = new CodeController();
+  main_menu.reset(new Menu());
+  main_menu->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2 + 35);
+  main_menu->add_entry(MNID_STARTGAME, _("Start Game"));
+  main_menu->add_entry(MNID_LEVELS_CONTRIB, _("Contrib Levels"));
+  main_menu->add_entry(MNID_ADDONS, _("Add-ons"));
+  main_menu->add_submenu(_("Options"), get_options_menu());
+  main_menu->add_entry(MNID_CREDITS, _("Credits"));
+  main_menu->add_entry(MNID_QUITMAINMENU, _("Quit"));
+}
 
-  titlesession = new GameSession("levels/misc/menu.stl", ST_GL_DEMO_GAME);
+TitleScreen::~TitleScreen()
+{
+}
 
-  /* Load images: */
-  bkg_title = new Surface("images/background/arctis.jpg");
-  logo = new Surface("images/engine/menu/logo.png");
-  //img_choose_subset = new Surface("images/status/choose-level-subset.png");
+void
+TitleScreen::setup()
+{
+  player_status->reset();
 
-  titlesession->get_current_sector()->activate("main");
-  titlesession->set_current();
+  Sector* sector = titlesession->get_current_sector();
+  if(Sector::current() != sector) {
+    sector->play_music(LEVEL_MUSIC);
+    sector->activate(sector->player->get_pos());
+  }
 
-  Player* player = titlesession->get_current_sector()->player;
-  player->set_controller(controller);
+  Menu::set_current(main_menu.get());
+}
 
-  /* --- Main title loop: --- */
-  frame = 0;
+void
+TitleScreen::leave()
+{
+  Sector* sector = titlesession->get_current_sector();
+  sector->deactivate();
+  Menu::set_current(NULL);
+}
 
-  Uint32 lastticks = SDL_GetTicks();
-  
-  Menu::set_current(main_menu);
-  DrawingContext& context = *titlesession->context;
+void
+TitleScreen::draw(DrawingContext& context)
+{
+  Sector* sector  = titlesession->get_current_sector();
+  sector->draw(context);
 
-  console = new Console(&context);
+  // FIXME: Add something to scale the frame to the resolution of the screen
+  context.draw_surface(frame.get(), Vector(0,0),LAYER_FOREGROUND1);
 
-  bool running = true;
-  while (running)
-    {
-      // Calculate the movement-factor
-      Uint32 ticks = SDL_GetTicks();
-      float elapsed_time = float(ticks - lastticks) / 1000.;
-      game_time += elapsed_time;
-      lastticks = ticks;
-      // 40fps is minimum
-      if(elapsed_time > .04)
-        elapsed_time = .04;
-      
-      /* Lower the speed so that Tux doesn't jump too hectically throught
-         the demo. */
-      elapsed_time /= 2;
-
-      SDL_Event event;
-      main_controller->update();
-      while (SDL_PollEvent(&event)) {
-        if (Menu::current()) {
-          Menu::current()->event(event);
-        }
-        main_controller->process_event(event);
-        if (event.type == SDL_QUIT)
-          throw graceful_shutdown();
-      }
-  
-      /* Draw the background: */
-      draw_demo(elapsed_time);
-
-      if (Menu::current() == main_menu)
-        context.draw_surface(logo, Vector(SCREEN_WIDTH/2 - logo->get_width()/2, 30),
-            LAYER_FOREGROUND1+1);
-
-      context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n",
-              Vector(0, SCREEN_HEIGHT - 50), LEFT_ALLIGN, LAYER_FOREGROUND1);
-      context.draw_text(white_small_text,
-        _(
-"Copyright (c) 2006 SuperTux Devel Team\n"
+  context.draw_text(small_font, "SuperTux " PACKAGE_VERSION "\n",
+      Vector(5, SCREEN_HEIGHT - 50), ALIGN_LEFT, LAYER_FOREGROUND1);
+  context.draw_text(small_font,
+      _(
+"Copyright (c) 2007 SuperTux Devel Team\n"
 "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to\n"
 "redistribute it under certain conditions; see the file COPYING for details.\n"
-        ),
-        Vector(0, SCREEN_HEIGHT - 50 + white_small_text->get_height() + 5),
-        LEFT_ALLIGN, LAYER_FOREGROUND1);
-
-      /* Don't draw menu, if quit is true */
-      Menu* menu = Menu::current();
-      if(menu)
-        {
-          menu->draw(context);
-          menu->update();
-  	  
-          if(menu == main_menu)
-            {
-              switch (main_menu->check())
-                {
-                case MNID_STARTGAME:
-                  // Start Game, ie. goto the slots menu
-                  update_load_save_game_menu(load_game_menu);
-                  break;
-                case MNID_LEVELS_CONTRIB:
-                  // Contrib Menu
-                  generate_contrib_menu();
-                  break;
-                case MNID_CREDITS:
-                  sound_manager->stop_music();
-                  fadeout(500);
-                  sound_manager->play_music("music/credits.ogg");
-                  display_text_file("credits.txt");
-                  sound_manager->stop_music();
-                  fadeout(500);
-                  Menu::set_current(main_menu);
-                  break;
-                case MNID_QUITMAINMENU:
-                  running = false;
-                  break;
-                }
-            }
-          else if(menu == options_menu)
-            {
-              process_options_menu();
-            }
-          else if(menu == load_game_menu)
-            {
-              if(event.key.keysym.sym == SDLK_DELETE)
-                {
-                int slot = menu->get_active_item_id();
-                std::stringstream stream;
-                stream << slot;
-                std::string str = _("Are you sure you want to delete slot") + stream.str() + "?";
-                
-                if(confirm_dialog(bkg_title, str.c_str())) {
-                  str = "save/slot" + stream.str() + ".stsg";
-                  msg_debug("Removing: " << str);
-                  PHYSFS_delete(str.c_str());
-                }
-
-                update_load_save_game_menu(load_game_menu);
-                Menu::set_current(main_menu);
-                resume_demo();
-                }
-              else if (process_load_game_menu())
-                {
-                  resume_demo();
-                }
-            }
-          else if(menu == contrib_menu)
-            {
-              check_levels_contrib_menu();
-            }
-          else if (menu == contrib_subset_menu)
-            {
-              check_contrib_subset_menu();
-            }
-        }
-
-      // reopen menu of user closed it (so that the app doesn't close when user
-      // accidently hit ESC)
-      if(Menu::current() == 0) {
-        Menu::set_current(main_menu);
-      }
+),
+      Vector(5, SCREEN_HEIGHT - 50 + small_font->get_height() + 5),
+      ALIGN_LEFT, LAYER_FOREGROUND1);
+}
 
-      console->draw();
+void
+TitleScreen::update(float elapsed_time)
+{
+  main_loop->set_speed(0.6f);
+  Sector* sector  = titlesession->get_current_sector();
+  sector->update(elapsed_time);
 
-      context.do_drawing();
-      sound_manager->update();
+  make_tux_jump();
+
+  Menu* menu = Menu::current();
+  if(menu) {
+    menu->update();
+
+    if(menu == main_menu.get()) {
+      switch (main_menu->check()) {
+        case MNID_STARTGAME:
+          // Start Game, ie. goto the slots menu
+          if(main_world.get() == NULL) {
+            main_world.reset(new World());
+            main_world->load("levels/world1/info");
+          }
+          current_world = main_world.get();
+          start_game();
+          break;
+
+        case MNID_LEVELS_CONTRIB:
+          // Contrib Menu
+          generate_contrib_menu();
+          Menu::push_current(contrib_menu.get());
+          break;
+
+        case MNID_ADDONS:
+          // Add-ons Menu
+          generate_addons_menu();
+          Menu::push_current(addons_menu.get());
+          break;
+
+        case MNID_CREDITS:
+          main_loop->push_screen(new TextScroller("credits.txt"),
+                                 new FadeOut(0.5));
+          break;
+
+        case MNID_QUITMAINMENU:
+          main_loop->quit(new FadeOut(0.25));
+          sound_manager->stop_music(0.25);
+          break;
+      }
+    } else if(menu == contrib_menu.get()) {
+      check_levels_contrib_menu();
+    } else if(menu == addons_menu.get()) {
+      check_addons_menu();
+    } else if (menu == contrib_world_menu.get()) {
+      check_contrib_world_menu();
+    }
+  }
 
-      //frame_rate.update();
+  // reopen menu of user closed it (so that the app doesn't close when user
+  // accidently hit ESC)
+  if(Menu::current() == 0) {
+    generate_main_menu();
+    Menu::set_current(main_menu.get());
+  }
+}
 
-      /* Pause: */
-      frame++;
-    }
-  /* Free surfaces: */
+void
+TitleScreen::start_game()
+{
+  std::string basename = current_world->get_basedir();
+  basename = basename.substr(0, basename.length()-1);
+  std::string worlddirname = FileSystem::basename(basename);
+  std::ostringstream stream;
+  stream << "profile" << config->profile << "/" << worlddirname << ".stsg";
+  std::string slotfile = stream.str();
 
-  free_contrib_menu();
-  delete titlesession;
-  delete bkg_title;
-  delete logo;
-  delete console;
-  //delete img_choose_subset;
+  try {
+    current_world->set_savegame_filename(slotfile);
+    current_world->run();
+  } catch(std::exception& e) {
+    log_fatal << "Couldn't start world: " << e.what() << std::endl;
+  }
 }