X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=1d111143682194123c90817cee435e1de7994efd;hb=acd1950b9b853d6b7c56a2cb43e77ec3147b2369;hp=514479d77b77759cb073ae3fea82b1580b96e301;hpb=9599042661b468aae7bd34dca05441c0ebc93ad7;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index 514479d77..1d1111436 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -22,6 +22,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,121 +31,108 @@
 #include <cmath>
 #include <SDL.h>
 #include <SDL_image.h>
-
-#ifndef WIN32
-#include <sys/types.h>
-#include <ctype.h>
-#endif
-
-#include "app/globals.h"
-#include "title.h"
-#include "video/screen.h"
-#include "video/surface.h"
-#include "gui/menu.h"
-#include "timer.h"
-#include "special/frame_rate.h"
-#include "app/setup.h"
-#include "lisp/lisp.h"
-#include "lisp/parser.h"
-#include "level.h"
-#include "level_subset.h"
-#include "gameloop.h"
-#include "worldmap.h"
-#include "leveleditor.h"
-#include "player_status.h"
-#include "tile.h"
-#include "sector.h"
-#include "object/tilemap.h"
-#include "object/camera.h"
-#include "object/player.h"
-#include "resources.h"
-#include "app/gettext.h"
-#include "misc.h"
-
-static Surface* bkg_title;
-static Surface* logo;
-static Surface* img_choose_subset;
-
-static bool walking;
-static Timer2 random_timer;
-
-static int frame;
-
-static GameSession* titlesession;
-
-static std::vector<LevelSubset*> contrib_subsets;
-static LevelSubset* current_contrib_subset = 0;
-
-static FrameRate frame_rate(100);  
-
-/* 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 <physfs.h>
+
+#include "title.hpp"
+#include "mainloop.hpp"
+#include "video/screen.hpp"
+#include "video/drawing_context.hpp"
+#include "video/surface.hpp"
+#include "audio/sound_manager.hpp"
+#include "gui/menu.hpp"
+#include "timer.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
+#include "level.hpp"
+#include "world.hpp"
+#include "game_session.hpp"
+#include "worldmap.hpp"
+#include "player_status.hpp"
+#include "tile.hpp"
+#include "sector.hpp"
+#include "object/tilemap.hpp"
+#include "object/camera.hpp"
+#include "object/player.hpp"
+#include "resources.hpp"
+#include "gettext.hpp"
+#include "misc.hpp"
+#include "textscroller.hpp"
+#include "file_system.hpp"
+#include "control/joystickkeyboardcontroller.hpp"
+#include "control/codecontroller.hpp"
+#include "main.hpp"
+#include "msg.hpp"
+#include "console.hpp"
+
+void
+TitleScreen::update_load_game_menu()
 {
-  // FIXME: shouldn't be needed if GameSession
-  // didn't relay on global variables
-  titlesession->get_current_sector()->activate();
-  titlesession->set_current();
-
-  frame_rate.update();
-}
+  load_game_menu.reset(new Menu());
 
-void update_load_save_game_menu(Menu* pmenu)
-{
-  for(int i = 2; i < 7; ++i)
-    {
-      // FIXME: Insert a real savegame struct/class here instead of
-      // doing string vodoo
-      std::string tmp = slotinfo(i - 1);
-      pmenu->item[i].kind = MN_ACTION;
-      pmenu->item[i].change_text(tmp.c_str());
-    }
+  load_game_menu->add_label(_("Start Game"));
+  load_game_menu->add_hl();
+  for(int i = 1; i <= 5; ++i) {
+    load_game_menu->add_entry(i, get_slotinfo(i));
+  }
+  load_game_menu->add_hl();
+  load_game_menu->add_back(_("Back"));
 }
 
-void free_contrib_menu()
+void
+TitleScreen::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();
+  contrib_worlds.clear();
+  current_contrib_world = 0;
+  current_world = -1;
 }
 
-void generate_contrib_menu()
+void
+TitleScreen::generate_contrib_menu()
 {
   /** Generating contrib levels list by making use of Level Subset  */
-  std::set<std::string> level_subsets = FileSystem::dsubdirs("/levels", "info");
+  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_worlds.push_back(filepath);
+  }
+  PHYSFS_freeList(files);
 
   free_contrib_menu();
+  contrib_menu.reset(new Menu());
 
-  contrib_menu->additem(MN_LABEL,_("Contrib Levels"),0,0);
-  contrib_menu->additem(MN_HL,"",0,0);
+  contrib_menu->add_label(_("Contrib Levels"));
+  contrib_menu->add_hl();
   
   int i = 0;
-  for (std::set<std::string>::iterator it = level_subsets.begin();
-      it != level_subsets.end(); ++it)
-    {
-      LevelSubset* subset = new LevelSubset();
-      subset->load(*it);
-      if(subset->hide_from_contribs) {
-        delete subset;
+  for (std::vector<std::string>::iterator it = level_worlds.begin();
+      it != level_worlds.end(); ++it) {
+    try {
+      std::auto_ptr<World> world (new World());
+      world->load(*it + "/info");
+      if(world->hide_from_contribs) {
         continue;
       }
-      contrib_menu->additem(MN_GOTO, subset->title, 0, contrib_subset_menu, i);
-      contrib_subsets.push_back(subset);
-      ++i;
+      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() << std::endl;
+#endif
     }
+  }
 
-  contrib_menu->additem(MN_HL,"",0,0);
-  contrib_menu->additem(MN_BACK,_("Back"),0,0);
-
-  level_subsets.clear();
+  contrib_menu->add_hl();
+  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;
@@ -158,298 +146,305 @@ std::string get_level_name(const std::string& filename)
     level->get("name", name);
     return name;
   } catch(std::exception& e) {
-    std::cerr << "Problem getting name of '" << filename << "'.\n";
+    msg_warning << "Problem getting name of '" << filename << "'." << std::endl;
     return "";
   }
 }
 
-void check_levels_contrib_menu()
+void
+TitleScreen::check_levels_contrib_menu()
 {
-  static int current_subset = -1;
-
   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());
-
-    // some fading
-    fadeout(256);
-    DrawingContext context;
-    context.draw_text(white_text, "Loading...",
-        Vector(screen->w/2, screen->h/2), CENTER_ALLIGN, LAYER_FOREGROUND1);
-    context.do_drawing();
-
-    // TODO: slots should be available for contrib maps
-    worldmap.loadgame(st_save_dir + "/" + subset.name + "-slot1.stsg");
+  World& world = * (contrib_worlds[index]);
 
-    worldmap.display();  // run the map
+  if(!world.is_levelset) {
+    // TODO fade out
+    world.run();
+    world.set_savegame_filename("save/test.save");
+    world.save();
+  }
 
-    Menu::set_current(main_menu);
-    resume_demo();
-  } else if (current_subset != index) {
-    current_subset = index;
-    // FIXME: This shouln't be busy looping
-    LevelSubset& subset = * (contrib_subsets[index]);
+  if (current_world != index) {
+    current_world = index;
+    World& world = * (contrib_worlds[index]);
 
-    current_contrib_subset = &subset;
+    current_contrib_world = &world;
 
-    contrib_subset_menu->clear();
+    contrib_world_menu.reset(new Menu());
 
-    contrib_subset_menu->additem(MN_LABEL, subset.title, 0,0);
-    contrib_subset_menu->additem(MN_HL,"",0,0);
+    contrib_world_menu->add_label(world.title);
+    contrib_world_menu->add_hl();
 
-    for (int i = 0; i < subset.get_num_levels(); ++i)
+    for (unsigned int i = 0; i < world.get_num_levels(); ++i)
     {
       /** get level's title */
-      std::string filename = subset.get_level_filename(i);
+      std::string filename = world.get_level_filename(i);
       std::string title = get_level_name(filename);
-      contrib_subset_menu->additem(MN_ACTION, title, 0, 0, i);
+      contrib_world_menu->add_entry(i, title);
     }
 
-    contrib_subset_menu->additem(MN_HL,"",0,0);      
-    contrib_subset_menu->additem(MN_BACK, _("Back"), 0, 0);
+    contrib_world_menu->add_hl();
+    contrib_world_menu->add_back(_("Back"));
 
-    titlesession->get_current_sector()->activate();
-    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();
-  if (index != -1)
-    {
-      if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION)
-        {
-          std::cout << "Starting level: " << index << std::endl;
-          
-          GameSession session(
-              current_contrib_subset->get_level_filename(index), ST_GL_PLAY);
-          session.run();
-          player_status.reset();
-          Menu::set_current(main_menu);
-          resume_demo();
-        }
-    }  
+  int index = contrib_world_menu->check();
+  if (index != -1) {
+    if (contrib_world_menu->get_item_by_id(index).kind == MN_ACTION) {
+      sound_manager->stop_music();
+      GameSession* session =
+        new GameSession(
+          current_contrib_world->get_level_filename(index), ST_GL_PLAY);
+      main_loop->push_screen(session);
+    }
+  }  
 }
 
-void draw_demo(float elapsed_time)
+void
+TitleScreen::make_tux_jump()
 {
-  Sector* world  = titlesession->get_current_sector();
-  Player* tux = world->player;
-
-  world->play_music(LEVEL_MUSIC);
-  
-  tux->key_event((SDLKey) keymap.right, true);
+  static Timer randomWaitTimer;
+  static Timer jumpPushTimer;
+  static float last_tux_x_pos = -1;
+  static float last_tux_y_pos = -1;
+
+  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 = tux->get_bbox();
+  lookahead.move(Vector(96, 0));
   
-  if(random_timer.check()) {
-    random_timer.start(float(rand() % 3000 + 3000) / 1000.);
-    walking = !walking;
-  } else {
-      if(walking)
-        tux->key_event((SDLKey) keymap.jump, false);
-      else
-        tux->key_event((SDLKey) keymap.jump, true);
+  // Check if we should press the jump button
+  bool randomJump = !randomWaitTimer.started();
+  bool notMoving = (fabsf(dx) + fabsf(dy)) < 0.1;
+  bool pathBlocked = !sector->is_free_space(lookahead); 
+  if (!controller->released(Controller::JUMP)
+      && (notMoving || pathBlocked || randomJump)) {
+    float jumpDuration;
+    if(pathBlocked)
+      jumpDuration = 0.5;
+    else
+      jumpDuration = float(rand() % 500 + 300) / 1000.0;
+    jumpPushTimer.start(jumpDuration);
+    randomWaitTimer.start(float(rand() % 3000 + 3000) / 1000.0);
   }
 
+  // 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(world->solids->get_width() * 32 - 320 < tux->get_pos().x)
-    {
-      tux->level_begin();
-      world->camera->reset(tux->get_pos());
-    }
+  if(sector->solids->get_width() * 32 - 320 < tux->get_pos().x) {
+    sector->activate("main");
+    sector->camera->reset(tux->get_pos());
+  }
+}
+
+TitleScreen::TitleScreen()
+{
+  controller.reset(new CodeController());
+  titlesession.reset(new GameSession("levels/misc/menu.stl", ST_GL_DEMO_GAME));
+
+  Player* player = titlesession->get_current_sector()->player;
+  player->set_controller(controller.get());
+}
+
+TitleScreen::~TitleScreen()
+{
+}
+
+void
+TitleScreen::setup()
+{
+  player_status->reset();
 
-  tux->can_jump = true;
-  float last_tux_x_pos = tux->get_pos().x;
-  world->action(elapsed_time);
+  Sector* sector = titlesession->get_current_sector();
+  if(Sector::current() != sector) {
+    sector->play_music(LEVEL_MUSIC);
+    sector->activate(sector->player->get_pos());
+  }
+
+  Menu::set_current(main_menu);
+}
+
+void
+TitleScreen::leave()
+{
+  Sector* sector = titlesession->get_current_sector();
+  sector->deactivate();
+}
+
+void
+TitleScreen::draw(DrawingContext& context)
+{
+  Sector* sector  = titlesession->get_current_sector();
+  sector->draw(context);
+ 
+  /*
+  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"
+"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);
+}
+
+void
+TitleScreen::update(float elapsed_time)
+{
+  main_loop->set_speed(0.6);
+  Sector* sector  = titlesession->get_current_sector();
+  sector->update(elapsed_time);
+
+  make_tux_jump();
   
+  Menu* menu = Menu::current();
+  if(menu) {
+    menu->update();
+  	  
+    if(menu == main_menu) {
+      switch (main_menu->check()) {
+        case MNID_STARTGAME:
+          // Start Game, ie. goto the slots menu
+          update_load_game_menu();
+          Menu::push_current(load_game_menu.get());
+          break;
+        case MNID_LEVELS_CONTRIB:
+          // Contrib Menu
+          generate_contrib_menu();
+          Menu::push_current(contrib_menu.get());
+          break;
+        case MNID_CREDITS:
+          fadeout(500);
+          main_loop->push_screen(new TextScroller("credits.txt"));
+          break;
+        case MNID_QUITMAINMENU:
+          main_loop->quit();
+          break;
+      }
+    } else if(menu == load_game_menu.get()) {
+      /*
+      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 << std::endl;
+          PHYSFS_delete(str.c_str());
+        }
 
-  // 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->get_pos().x)
-    {
-      walking = false;
+        update_load_save_game_menu(load_game_menu);
+        Menu::set_current(main_menu);
+      }*/
+      process_load_game_menu();
+    } else if(menu == contrib_menu.get()) {
+      check_levels_contrib_menu();
+    } else if (menu == contrib_world_menu.get()) {
+      check_contrib_world_menu();
     }
+  }
 
-  world->draw(*titlesession->context);
+  // 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);
+  }
 }
 
-/* --- TITLE SCREEN --- */
-void title(void)
+std::string
+TitleScreen::get_slotinfo(int slot)
 {
-  walking = true;
-  LevelEditor* leveleditor;
-  MusicRef credits_music;
+  std::string tmp;
+  std::string slotfile;
+  std::string title;
+  std::stringstream stream;
+  stream << slot;
+  slotfile = "save/slot" + stream.str() + ".stsg";
 
-  Ticks::pause_init();
+  try {
+    lisp::Parser parser;
+    std::auto_ptr<lisp::Lisp> root (parser.parse(slotfile));
 
-  titlesession = new GameSession(get_resource_filename("levels/misc/menu.stl"),
-      ST_GL_DEMO_GAME);
+    const lisp::Lisp* savegame = root->get_lisp("supertux-savegame");
+    if(!savegame)
+      throw std::runtime_error("file is not a supertux-savegame.");
 
-  /* Load images: */
-  bkg_title = new Surface(datadir + "/images/background/arctis.jpg", false);
-  logo = new Surface(datadir + "/images/title/logo.png", true);
-  img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", true);
+    savegame->get("title", title);
+  } catch(std::exception& e) {
+    return std::string(_("Slot")) + " " + stream.str() + " - " +
+      std::string(_("Free"));
+  }
 
-  titlesession->get_current_sector()->activate();
-  titlesession->set_current();
+  return std::string("Slot ") + stream.str() + " - " + title;
+}
 
-  /* --- Main title loop: --- */
-  frame = 0;
+bool
+TitleScreen::process_load_game_menu()
+{
+  int slot = load_game_menu->check();
 
-  random_timer.start(float(rand() % 2000 + 2000) / 1000.0);
+  if(slot == -1)
+    return false;
 
-  Uint32 lastticks = SDL_GetTicks();
-  
-  Menu::set_current(main_menu);
-  DrawingContext& context = *titlesession->context;
-  while (Menu::current())
-    {
-      // Calculate the movement-factor
-      Uint32 ticks = SDL_GetTicks();
-      float elapsed_time = float(ticks - lastticks) / 1000.;
-      global_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;
-      while (SDL_PollEvent(&event))
-        {
-          if (Menu::current())
-            {
-              Menu::current()->event(event);
-            }
-         // FIXME: QUIT signal should be handled more generic, not locally
-          if (event.type == SDL_QUIT)
-            Menu::set_current(0);
-        }
-  
-      /* Draw the background: */
-      draw_demo(elapsed_time);
-      
-      
-      if (Menu::current() == main_menu)
-        context.draw_surface(logo, Vector(screen->w/2 - logo->w/2, 30),
-            LAYER_FOREGROUND1+1);
+  if(load_game_menu->get_item_by_id(slot).kind != MN_ACTION)
+    return false;
 
-      context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n",
-              Vector(0, screen->h - 70), LEFT_ALLIGN, LAYER_FOREGROUND1);
-      context.draw_text(white_small_text,
-        _(
-"Copyright (c) 2003 SuperTux Devel Team\n"
-"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
-"are welcome to redistribute it under certain conditions; see the file COPYING\n"
-"for details.\n"
-        ),
-        Vector(0, screen->h - 70 + white_small_text->get_height()),
-        LEFT_ALLIGN, LAYER_FOREGROUND1);
-
-      /* Don't draw menu, if quit is true */
-      Menu* menu = Menu::current();
-      if(menu)
-        {
-          menu->draw(context);
-          menu->action();
-  	  
-          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
-                  puts("Entering contrib menu");
-                  generate_contrib_menu();
-                  break;
-                case MNID_LEVELEDITOR:
-                  leveleditor = new LevelEditor();
-                  leveleditor->run();
-                  delete leveleditor;
-                  Menu::set_current(main_menu);
-                  resume_demo();
-                  break;
-                case MNID_CREDITS:
-                  fadeout(500);
-                  credits_music = SoundManager::get()->load_music(datadir + "/music/credits.ogg");
-                  SoundManager::get()->play_music(credits_music);
-                  display_text_file("credits.txt", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text );
-                  fadeout(500);
-                  Menu::set_current(main_menu);
-                  break;
-                case MNID_QUITMAINMENU:
-                  Menu::set_current(0);
-                  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 = st_save_dir + "/slot" + stream.str() + ".stsg";
-                  printf("Removing: %s\n",str.c_str());
-                  remove(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();
-            }
-        }
+  std::stringstream stream;
+  stream << slot;
+  std::string slotfile = "save/slot" + stream.str() + ".stsg";
 
-      mouse_cursor->draw(context);
-     
-      context.do_drawing();
+  sound_manager->stop_music();
+  fadeout(256);
+  DrawingContext context;
+  context.draw_text(white_text, "Loading...",
+                    Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT/2),
+                    CENTER_ALLIGN, LAYER_FOREGROUND1);
+  context.do_drawing();
 
-      frame_rate.update();
+  WorldMapNS::WorldMap* worldmap = new WorldMapNS::WorldMap();
 
-      /* Pause: */
-      frame++;
-    }
-  /* Free surfaces: */
+  worldmap->set_map_filename("/levels/world1/worldmap.stwm");
+  // Load the game or at least set the savegame_file variable
+  worldmap->loadgame(slotfile);
 
-  free_contrib_menu();
-  delete titlesession;
-  delete bkg_title;
-  delete logo;
-  delete img_choose_subset;
+  main_loop->push_screen(worldmap);
+
+  //Menu::set_current(main_menu);
+
+  return true;
 }