implemented an install target in scons
[supertux.git] / src / worldmap.cpp
index 1b07354..655710d 100644 (file)
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <config.h>
+
 #include <iostream>
 #include <fstream>
 #include <vector>
-#include <assert.h>
-#include "globals.h"
-#include "texture.h"
-#include "screen.h"
-#include "lispreader.h"
+#include <cassert>
+#include <unistd.h>
+
+#include "app/globals.h"
+#include "video/surface.h"
+#include "video/screen.h"
+#include "video/drawing_context.h"
+#include "utils/lispreader.h"
+#include "utils/lispwriter.h"
+#include "special/frame_rate.h"
 #include "gameloop.h"
-#include "setup.h"
+#include "app/setup.h"
+#include "sector.h"
 #include "worldmap.h"
+#include "audio/sound_manager.h"
+#include "resources.h"
+#include "app/gettext.h"
+#include "misc.h"
+#include "scene.h"
+
+#define map_message_TIME 2.8
+
+Menu* worldmap_menu  = 0;
 
 namespace WorldMapNS {
 
@@ -35,18 +52,18 @@ Direction reverse_dir(Direction direction)
 {
   switch(direction)
     {
-    case WEST:
-      return EAST;
-    case EAST:
-      return WEST;
-    case NORTH:
-      return SOUTH;
-    case SOUTH:
-      return NORTH;
-    case NONE:
-      return NONE;
+    case D_WEST:
+      return D_EAST;
+    case D_EAST:
+      return D_WEST;
+    case D_NORTH:
+      return D_SOUTH;
+    case D_SOUTH:
+      return D_NORTH;
+    case D_NONE:
+      return D_NONE;
     }
-  return NONE;
+  return D_NONE;
 }
 
 std::string
@@ -54,13 +71,13 @@ direction_to_string(Direction direction)
 {
   switch(direction)
     {
-    case WEST:
+    case D_WEST:
       return "west";
-    case EAST:
+    case D_EAST:
       return "east";
-    case NORTH:
+    case D_NORTH:
       return "north";
-    case SOUTH:
+    case D_SOUTH:
       return "south";
     default:
       return "none";
@@ -71,26 +88,24 @@ Direction
 string_to_direction(const std::string& directory)
 {
   if (directory == "west")
-    return WEST;
+    return D_WEST;
   else if (directory == "east")
-    return EAST;
+    return D_EAST;
   else if (directory == "north")
-    return NORTH;
+    return D_NORTH;
   else if (directory == "south")
-    return SOUTH;
+    return D_SOUTH;
   else
-    return NONE;
+    return D_NONE;
 }
 
-TileManager* TileManager::instance_  = 0;
-
 TileManager::TileManager()
 {
-  std::string stwt_filename = datadir +  "images/worldmap/antarctica.stwt";
+  std::string stwt_filename = datadir +  "/images/worldmap/antarctica.stwt";
   lisp_object_t* root_obj = lisp_read_from_file(stwt_filename);
  
   if (!root_obj)
-    st_abort("Couldn't load file", stwt_filename);
+    Termination::abort("Couldn't load file", stwt_filename);
 
   if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap-tiles") == 0)
     {
@@ -103,27 +118,70 @@ TileManager::TileManager()
           if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0)
             {
               int id = 0;
-              std::string filename = "<invalid>";
 
               Tile* tile = new Tile;             
-              tile->north = true;
-              tile->east  = true;
-              tile->south = true;
-              tile->west  = true;
+              tile->north = tile->east = tile->south = tile->west = true;
               tile->stop  = true;
-  
+              tile->auto_walk = false;
+
               LispReader reader(lisp_cdr(element));
-              reader.read_int("id",  &id);
-              reader.read_bool("north", &tile->north);
-              reader.read_bool("south", &tile->south);
-              reader.read_bool("west",  &tile->west);
-              reader.read_bool("east",  &tile->east);
-              reader.read_bool("stop",  &tile->stop);
-              reader.read_string("image",  &filename);
-
-              tile->sprite = new Surface(
-                           datadir +  "/images/worldmap/" + filename, 
-                           USE_ALPHA);
+              reader.read_int("id", id);
+
+              std::string temp;
+              reader.read_string("possible-directions", temp);
+              if(!temp.empty())
+                {
+                tile->north = tile->east = tile->south = tile->west = false;
+                if(temp.find("north") != std::string::npos)
+                  tile->north = true;
+                if(temp.find("south") != std::string::npos)
+                  tile->south = true;
+                if(temp.find("east") != std::string::npos)
+                  tile->east = true;
+                if(temp.find("west") != std::string::npos)
+                  tile->west = true;
+                }
+
+              /* For backward compatibility */
+              reader.read_bool("north", tile->north);
+              reader.read_bool("south", tile->south);
+              reader.read_bool("west",  tile->west);
+              reader.read_bool("east",  tile->east);
+
+              reader.read_bool("stop",  tile->stop);
+              reader.read_bool("auto-walk",  tile->auto_walk);
+
+              reader.read_string("one-way", temp);
+              tile->one_way = BOTH_WAYS;
+              if(!temp.empty())
+                {
+                if(temp == "north-south")
+                  tile->one_way = NORTH_SOUTH_WAY;
+                else if(temp == "south-north")
+                  tile->one_way = SOUTH_NORTH_WAY;
+                else if(temp == "east-west")
+                  tile->one_way = EAST_WEST_WAY;
+                else if(temp == "west-east")
+                  tile->one_way = WEST_EAST_WAY;
+                }
+
+              std::vector<std::string> filenames;
+              reader.read_string_vector("image", filenames);
+
+              if(filenames.size() == 0)
+                std::cerr << "Warning: no image specified for tile " << id
+                          << ".\nIgnoring...\n" << std::endl;
+
+              for(int i = 0; static_cast<unsigned int>(i) < filenames.size(); i++)
+                {
+                Surface* image = new Surface(
+                         datadir +  "/images/worldmap/" + filenames[i], true);
+                tile->images.push_back(image);
+                }
+
+              tile->anim_speed = 25;
+              reader.read_int("anim-speed", tile->anim_speed);
+
 
               if (id >= int(tiles.size()))
                 tiles.resize(id+1);
@@ -142,6 +200,14 @@ TileManager::TileManager()
     {
       assert(0);
     }
+
+  lisp_free(root_obj);
+}
+
+TileManager::~TileManager()
+{
+  for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i)
+    delete *i;
 }
 
 Tile*
@@ -151,28 +217,53 @@ TileManager::get(int i)
   return tiles[i];
 }
 
+//---------------------------------------------------------------------------
+
 Tux::Tux(WorldMap* worldmap_)
   : worldmap(worldmap_)
 {
-  sprite = new Surface(datadir +  "/images/worldmap/tux.png", USE_ALPHA);
+  largetux_sprite = new Surface(datadir +  "/images/worldmap/tux.png", true);
+  firetux_sprite = new Surface(datadir +  "/images/worldmap/firetux.png", true);
+  smalltux_sprite = new Surface(datadir +  "/images/worldmap/smalltux.png", true);
+
   offset = 0;
   moving = false;
-  tile_pos.x = 5;
-  tile_pos.y = 5;
-  direction = NONE;
-  input_direction = NONE;
+  tile_pos.x = worldmap->get_start_x();
+  tile_pos.y = worldmap->get_start_y();
+  direction = D_NONE;
+  input_direction = D_NONE;
+}
+
+Tux::~Tux()
+{
+  delete smalltux_sprite;
+  delete firetux_sprite;
+  delete largetux_sprite;
 }
 
 void
-Tux::draw(const Point& offset)
+Tux::draw(DrawingContext& context, const Vector& offset)
 {
-  Point pos = get_pos();
-  sprite->draw(pos.x + offset.x, 
-               pos.y + offset.y);
+  Vector pos = get_pos();
+  switch (player_status.bonus)
+    {
+    case PlayerStatus::GROWUP_BONUS:
+      context.draw_surface(largetux_sprite,
+          Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS);
+      break;
+    case PlayerStatus::FLOWER_BONUS:
+      context.draw_surface(firetux_sprite,
+          Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS);
+      break;
+    case PlayerStatus::NO_BONUS:
+      context.draw_surface(smalltux_sprite,
+          Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS);
+      break;
+    }
 }
 
 
-Point
+Vector
 Tux::get_pos()
 {
   float x = tile_pos.x * 32;
@@ -180,44 +271,51 @@ Tux::get_pos()
 
   switch(direction)
     {
-    case WEST:
+    case D_WEST:
       x -= offset - 32;
       break;
-    case EAST:
+    case D_EAST:
       x += offset - 32;
       break;
-    case NORTH:
+    case D_NORTH:
       y -= offset - 32;
       break;
-    case SOUTH:
+    case D_SOUTH:
       y += offset - 32;
       break;
-    case NONE:
+    case D_NONE:
       break;
     }
   
-  return Point((int)x, (int)y); 
+  return Vector((int)x, (int)y); 
 }
 
 void
 Tux::stop()
 {
   offset = 0;
-  direction = NONE;
+  direction = D_NONE;
+  input_direction = D_NONE;
   moving = false;
 }
 
 void
-Tux::update(float delta)
+Tux::set_direction(Direction dir)
+{
+input_direction = dir;
+}
+
+void
+Tux::action(float delta)
 {
   if (!moving)
     {
-      if (input_direction != NONE)
+      if (input_direction != D_NONE)
         { 
           WorldMap::Level* level = worldmap->at_level();
 
           // We got a new direction, so lets start walking when possible
-          Point next_tile;
+          Vector next_tile;
           if ((!level || level->solved)
               && worldmap->path_ok(input_direction, tile_pos, &next_tile))
             {
@@ -228,7 +326,6 @@ Tux::update(float delta)
             }
           else if (input_direction == back_direction)
             {
-              std::cout << "Back triggered" << std::endl;
               moving = true;
               direction = input_direction;
               tile_pos = worldmap->get_next_tile(tile_pos, direction);
@@ -245,63 +342,178 @@ Tux::update(float delta)
         { // We reached the next tile, so we check what to do now
           offset -= 32;
 
-          if (worldmap->at(tile_pos)->stop || worldmap->at_level())
+          WorldMap::SpecialTile* special_tile = worldmap->at_special_tile();
+          if(special_tile && special_tile->passive_message)
+            {  // direction and the apply_action_ are opposites, since they "see"
+               // directions in a different way
+            if((direction == D_NORTH && special_tile->apply_action_south) ||
+               (direction == D_SOUTH && special_tile->apply_action_north) ||
+               (direction == D_WEST && special_tile->apply_action_east) ||
+               (direction == D_EAST && special_tile->apply_action_west))
+              {
+              worldmap->passive_message = special_tile->map_message;
+              worldmap->passive_message_timer.start(map_message_TIME);
+              }
+            }
+
+          if (worldmap->at(tile_pos)->stop ||
+             (special_tile && !special_tile->passive_message) ||
+              worldmap->at_level())
             {
+              if(special_tile && !special_tile->map_message.empty() &&
+                !special_tile->passive_message)
+                worldmap->passive_message_timer.start(0);
               stop();
             }
           else
             {
+              if (worldmap->at(tile_pos)->auto_walk || direction != input_direction)
+                { // Turn to a new direction
+                  Tile* tile = worldmap->at(tile_pos);
+
+                  if(direction != input_direction && 
+                     ((tile->north && input_direction == D_NORTH) ||
+                     (tile->south && input_direction == D_SOUTH) ||
+                     (tile->east && input_direction == D_EAST) ||
+                     (tile->west && input_direction == D_WEST)))
+                    {  // player has changed direction during auto-movement
+                    direction = input_direction;
+                    back_direction = reverse_dir(direction);
+                    }
+                  else if(direction != input_direction)
+                    {  // player has changed to impossible tile
+                      back_direction = reverse_dir(direction);
+                      stop();
+                    }
+                  else
+                    {
+                    Direction dir = D_NONE;
+                  
+                    if (tile->north && back_direction != D_NORTH)
+                      dir = D_NORTH;
+                    else if (tile->south && back_direction != D_SOUTH)
+                      dir = D_SOUTH;
+                    else if (tile->east && back_direction != D_EAST)
+                      dir = D_EAST;
+                    else if (tile->west && back_direction != D_WEST)
+                      dir = D_WEST;
+
+                    if (dir != D_NONE)
+                      {
+                      direction = dir;
+                      input_direction = direction;
+                      back_direction = reverse_dir(direction);
+                      }
+                    else
+                      {
+                      // Should never be reached if tiledata is good
+                      stop();
+                      return;
+                      }
+                    }
+                  }
+
               // Walk automatically to the next tile
-              Point next_tile;
-              if (worldmap->path_ok(direction, tile_pos, &next_tile))
+              if(direction != D_NONE)
                 {
+                Vector next_tile;
+                if (worldmap->path_ok(direction, tile_pos, &next_tile))
+                  {
                   tile_pos = next_tile;
-                }
-              else
-                {
+                  }
+                else
+                  {
                   puts("Tilemap data is buggy");
                   stop();
+                  }
                 }
             }
         }
     }
 }
 
-WorldMap::WorldMap()
+//---------------------------------------------------------------------------
+Tile::Tile()
 {
-  tux = new Tux(this);
+}
+
+Tile::~Tile()
+{
+  for(std::vector<Surface*>::iterator i = images.begin(); i != images.end(); i++)
+    delete *i;
+}
+
+
+void
+Tile::draw(DrawingContext& context, Vector pos)
+{
+  // same code as from tile_manager.cpp draw_tile()
+
+  if(!images.size())
+    return;
+
+  if(images.size() > 1)
+    {
+    size_t frame 
+      = ((global_frame_counter*25) / anim_speed) % images.size();
 
+    context.draw_surface(images[frame], pos, LAYER_TILES);
+    }
+  else if (images.size() == 1)
+    {
+    context.draw_surface(images[0], pos, LAYER_TILES);
+    }
+}
+
+//---------------------------------------------------------------------------
+
+WorldMap::WorldMap()
+{
+  tile_manager = new TileManager();
+  //tux = new Tux(this);
+  
   width  = 20;
   height = 15;
+  
+  start_x = 4;
+  start_y = 5;
 
-  level_sprite = new Surface(datadir +  "/images/worldmap/levelmarker.png", USE_ALPHA);
-  leveldot_green = new Surface(datadir +  "/images/worldmap/leveldot_green.png", USE_ALPHA);
-  leveldot_red = new Surface(datadir +  "/images/worldmap/leveldot_red.png", USE_ALPHA);
+  tux = new Tux(this);
+  
+  leveldot_green = new Surface(datadir +  "/images/worldmap/leveldot_green.png", true);
+  leveldot_red = new Surface(datadir +  "/images/worldmap/leveldot_red.png", true);
+  messagedot   = new Surface(datadir +  "/images/worldmap/messagedot.png", true);
+  teleporterdot   = new Surface(datadir +  "/images/worldmap/teleporterdot.png", true);
 
-  input_direction = NONE;
   enter_level = false;
 
-  name = "<no file>";
-  music = "SALCON.MOD";
-  song = 0;
+  name = "<no title>";
+  music = "salcon.mod";
 
-  load_map();
+  global_frame_counter = 0;
+
+  total_stats.reset();
 }
 
 WorldMap::~WorldMap()
 {
   delete tux;
+  delete tile_manager;
+
+  delete leveldot_green;
+  delete leveldot_red;
+  delete messagedot;
+  delete teleporterdot;
 }
 
+// Don't forget to set map_filename before calling this
 void
 WorldMap::load_map()
 {
-  std::string filename = datadir +  "levels/default/worldmap.stwm";
-  
-  lisp_object_t* root_obj = lisp_read_from_file(filename);
+  lisp_object_t* root_obj = lisp_read_from_file(datadir + "/levels/worldmap/" + map_filename);
   if (!root_obj)
-    st_abort("Couldn't load file", filename);
-  
+    Termination::abort("Couldn't load file", datadir + "/levels/worldmap/" + map_filename);
+
   if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap") == 0)
     {
       lisp_object_t* cur = lisp_cdr(root_obj);
@@ -313,25 +525,72 @@ WorldMap::load_map()
           if (strcmp(lisp_symbol(lisp_car(element)), "tilemap") == 0)
             {
               LispReader reader(lisp_cdr(element));
-              reader.read_int("width",  &width);
-              reader.read_int("height", &height);
-              reader.read_int_vector("data", &tilemap);
+              reader.read_int("width",  width);
+              reader.read_int("height", height);
+              reader.read_int_vector("data", tilemap);
             }
           else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
             {
               LispReader reader(lisp_cdr(element));
-              reader.read_string("name",  &name);
-              reader.read_string("music", &music);
+              reader.read_string("name", name, true);
+              reader.read_string("music", music);
+             reader.read_int("start_pos_x", start_x);
+             reader.read_int("start_pos_y", start_y);
             }
-          else if (strcmp(lisp_symbol(lisp_car(element)), "levels") == 0)
+          else if (strcmp(lisp_symbol(lisp_car(element)), "special-tiles") == 0 ||
+                   strcmp(lisp_symbol(lisp_car(element)), "levels") == 0)
             {
               lisp_object_t* cur = lisp_cdr(element);
               
               while(!lisp_nil_p(cur))
                 {
                   lisp_object_t* element = lisp_car(cur);
-                  
-                  if (strcmp(lisp_symbol(lisp_car(element)), "level") == 0)
+
+                  if (strcmp(lisp_symbol(lisp_car(element)), "special-tile") == 0)
+                    {
+                      SpecialTile special_tile;
+                      LispReader reader(lisp_cdr(element));
+                      
+                      reader.read_float("x", special_tile.pos.x);
+                      reader.read_float("y", special_tile.pos.y);
+
+                      special_tile.map_message.erase();
+                      reader.read_string("map-message", special_tile.map_message);
+                      special_tile.passive_message = false;
+                      reader.read_bool("passive-message", special_tile.passive_message);
+
+                      special_tile.teleport_dest = Vector(-1,-1);
+                      reader.read_float("teleport-to-x", special_tile.teleport_dest.x);
+                      reader.read_float("teleport-to-y", special_tile.teleport_dest.y);
+
+                      special_tile.invisible = false;
+                      reader.read_bool("invisible-tile", special_tile.invisible);
+
+                      special_tile.apply_action_north = special_tile.apply_action_south =
+                          special_tile.apply_action_east = special_tile.apply_action_west =
+                          true;
+
+                      std::string apply_direction;
+                      reader.read_string("apply-to-direction", apply_direction);
+                      if(!apply_direction.empty())
+                        {
+                        special_tile.apply_action_north = special_tile.apply_action_south =
+                            special_tile.apply_action_east = special_tile.apply_action_west =
+                            false;
+                        if(apply_direction.find("north") != std::string::npos)
+                          special_tile.apply_action_north = true;
+                        if(apply_direction.find("south") != std::string::npos)
+                          special_tile.apply_action_south = true;
+                        if(apply_direction.find("east") != std::string::npos)
+                          special_tile.apply_action_east = true;
+                        if(apply_direction.find("west") != std::string::npos)
+                          special_tile.apply_action_west = true;
+                        }
+
+                      special_tiles.push_back(special_tile);
+                    }
+
+                  else if (strcmp(lisp_symbol(lisp_car(element)), "level") == 0)
                     {
                       Level level;
                       LispReader reader(lisp_cdr(element));
@@ -342,11 +601,21 @@ WorldMap::load_map()
                       level.south = true;
                       level.west  = true;
 
-                      reader.read_string("name",  &level.name);
-                      reader.read_int("x", &level.x);
-                      reader.read_int("y", &level.y);
+                      reader.read_string("extro-filename", level.extro_filename);
+                      reader.read_string("next-worldmap", level.next_worldmap);
+
+                      level.quit_worldmap = false;
+                      reader.read_bool("quit-worldmap", level.quit_worldmap);
+
+                      reader.read_string("name", level.name, true);
+                      reader.read_float("x", level.pos.x);
+                      reader.read_float("y", level.pos.y);
+
+                      level.auto_path = true;
+                      reader.read_bool("auto-path", level.auto_path);
 
-                      get_level_title(&level);   // get level's title
+                      level.vertical_flip = false;
+                      reader.read_bool("vertical-flip", level.vertical_flip);
 
                       levels.push_back(level);
                     }
@@ -362,38 +631,39 @@ WorldMap::load_map()
           cur = lisp_cdr(cur);
         }
     }
-}
 
-void WorldMap::get_level_title(Levels::pointer level)
-{
-/** get level's title */
-level->title = "<no title>";
+    lisp_free(root_obj);
 
-FILE * fi;
-lisp_object_t* root_obj = 0;
-fi = fopen((datadir +  "levels/" + level->name).c_str(), "r");
-if (fi == NULL)
-  {
-  perror((datadir +  "levels/" + level->name).c_str());
-  return;
-  }
+    delete tux;
+    tux = new Tux(this);
+}
 
-lisp_stream_t stream;
-lisp_stream_init_file (&stream, fi);
-root_obj = lisp_read (&stream);
+void WorldMap::get_level_title(Level& level)
+{
+  /** get special_tile's title */
+  level.title = "<no title>";
 
-if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR)
-  {
-  printf("World: Parse Error in file %s", level->name.c_str());
-  }
+  LispReader* reader = LispReader::load(datadir + "/levels/" + level.name, "supertux-level");
+  if(!reader)
+    {
+    std::cerr << "Error: Could not open level file. Ignoring...\n";
+    return;
+    }
 
-if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0)
-  {
-  LispReader reader(lisp_cdr(root_obj));
-  reader.read_string("name",  &level->title);
-  }
+  reader->read_string("name", level.title, true);
+  delete reader;
+}
 
-fclose(fi);
+void WorldMap::calculate_total_stats()
+{
+  total_stats.reset();
+  for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+    {
+    if (i->solved)
+      {
+      total_stats += i->statistics;
+      }
+    }
 }
 
 void
@@ -401,7 +671,10 @@ WorldMap::on_escape_press()
 {
   // Show or hide the menu
   if(!Menu::current())
+    {
     Menu::set_current(worldmap_menu); 
+    tux->set_direction(D_NONE);  // stop tux movement when menu is called
+    }
   else
     Menu::set_current(0); 
 }
@@ -410,8 +683,8 @@ void
 WorldMap::get_input()
 {
   enter_level = false;
-  input_direction = NONE;
-   
+  SDLKey key;
+
   SDL_Event event;
   while (SDL_PollEvent(&event))
     {
@@ -424,38 +697,54 @@ WorldMap::get_input()
           switch(event.type)
             {
             case SDL_QUIT:
-              st_abort("Received window close", "");
+              Termination::abort("Received window close", "");
               break;
           
             case SDL_KEYDOWN:
-              switch(event.key.keysym.sym)
-                {
-                case SDLK_ESCAPE:
-                  on_escape_press();
-                  break;
-                case SDLK_LCTRL:
-                case SDLK_RETURN:
-                  enter_level = true;
-                  break;
-                default:
-                  break;
-                }
+              key = event.key.keysym.sym;
+
+              if(key == SDLK_ESCAPE)
+                on_escape_press();
+              else if(key == SDLK_RETURN || key == keymap.power)
+                enter_level = true;
+              else if(key == SDLK_LEFT || key == keymap.power)
+                tux->set_direction(D_WEST);
+              else if(key == SDLK_RIGHT || key == keymap.right)
+                tux->set_direction(D_EAST);
+              else if(key == SDLK_UP || key == keymap.up ||
+                key == keymap.jump)
+                  // there might be ppl that use jump as up key
+                tux->set_direction(D_NORTH);
+              else if(key == SDLK_DOWN || key == keymap.down)
+                tux->set_direction(D_SOUTH);
+              break;
+
+            case SDL_JOYHATMOTION:
+              if(event.jhat.value & SDL_HAT_UP) {
+                tux->set_direction(D_NORTH);
+              } else if(event.jhat.value & SDL_HAT_DOWN) {
+                tux->set_direction(D_SOUTH);
+              } else if(event.jhat.value & SDL_HAT_LEFT) {
+                tux->set_direction(D_WEST);
+              } else if(event.jhat.value & SDL_HAT_RIGHT) {
+                tux->set_direction(D_EAST);
+              }
               break;
           
             case SDL_JOYAXISMOTION:
               if (event.jaxis.axis == joystick_keymap.x_axis)
                 {
                   if (event.jaxis.value < -joystick_keymap.dead_zone)
-                    input_direction = WEST;
+                    tux->set_direction(D_WEST);
                   else if (event.jaxis.value > joystick_keymap.dead_zone)
-                    input_direction = EAST;
+                    tux->set_direction(D_EAST);
                 }
               else if (event.jaxis.axis == joystick_keymap.y_axis)
                 {
                   if (event.jaxis.value > joystick_keymap.dead_zone)
-                    input_direction = SOUTH;
+                    tux->set_direction(D_SOUTH);
                   else if (event.jaxis.value < -joystick_keymap.dead_zone)
-                    input_direction = NORTH;
+                    tux->set_direction(D_NORTH);
                 }
               break;
 
@@ -471,47 +760,33 @@ WorldMap::get_input()
             }
         }
     }
-
-  if (!Menu::current())
-    {
-      Uint8 *keystate = SDL_GetKeyState(NULL);
-  
-      if (keystate[SDLK_LEFT])
-        input_direction = WEST;
-      else if (keystate[SDLK_RIGHT])
-        input_direction = EAST;
-      else if (keystate[SDLK_UP])
-        input_direction = NORTH;
-      else if (keystate[SDLK_DOWN])
-        input_direction = SOUTH;
-    }
 }
 
-Point
-WorldMap::get_next_tile(Point pos, Direction direction)
+Vector
+WorldMap::get_next_tile(Vector pos, Direction direction)
 {
   switch(direction)
     {
-    case WEST:
+    case D_WEST:
       pos.x -= 1;
       break;
-    case EAST:
+    case D_EAST:
       pos.x += 1;
       break;
-    case NORTH:
+    case D_NORTH:
       pos.y -= 1;
       break;
-    case SOUTH:
+    case D_SOUTH:
       pos.y += 1;
       break;
-    case NONE:
+    case D_NONE:
       break;
     }
   return pos;
 }
 
 bool
-WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos)
+WorldMap::path_ok(Direction direction, Vector old_pos, Vector* new_pos)
 {
   *new_pos = get_next_tile(old_pos, direction);
 
@@ -520,23 +795,33 @@ WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos)
     { // New position is outsite the tilemap
       return false;
     }
+  else if(at(*new_pos)->one_way != BOTH_WAYS)
+    {
+std::cerr << "one way only\n";
+      if((at(*new_pos)->one_way == NORTH_SOUTH_WAY && direction != D_SOUTH) ||
+         (at(*new_pos)->one_way == SOUTH_NORTH_WAY && direction != D_NORTH) ||
+         (at(*new_pos)->one_way == EAST_WEST_WAY && direction != D_WEST) ||
+         (at(*new_pos)->one_way == WEST_EAST_WAY && direction != D_EAST))
+        return false;
+      return true;
+    }
   else
     { // Check if we the tile allows us to go to new_pos
       switch(direction)
         {
-        case WEST:
+        case D_WEST:
           return (at(old_pos)->west && at(*new_pos)->east);
 
-        case EAST:
+        case D_EAST:
           return (at(old_pos)->east && at(*new_pos)->west);
 
-        case NORTH:
+        case D_NORTH:
           return (at(old_pos)->north && at(*new_pos)->south);
 
-        case SOUTH:
+        case D_SOUTH:
           return (at(old_pos)->south && at(*new_pos)->north);
 
-        case NONE:
+        case D_NONE:
           assert(!"path_ok() can't work if direction is NONE");
         }
       return false;
@@ -544,61 +829,172 @@ WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos)
 }
 
 void
-WorldMap::update()
+WorldMap::update(float delta)
 {
+  if(!frame_timer.check()) {
+    global_frame_counter++;
+  }
+
   if (enter_level && !tux->is_moving())
     {
+      /* Check special tile action */
+      SpecialTile* special_tile = at_special_tile();
+      if(special_tile)
+        {
+        if (special_tile->teleport_dest != Vector(-1,-1))
+          {
+          // TODO: an animation, camera scrolling or a fading would be a nice touch
+          SoundManager::get()->play_sound(IDToSound(SND_WARP));
+          tux->back_direction = D_NONE;
+          tux->set_tile_pos(special_tile->teleport_dest);
+          SDL_Delay(1000);
+          }
+        }
+
+      /* Check level action */
+      bool level_finished = true;
       Level* level = at_level();
-      if (level)
+      if (!level)
         {
-          if (level->x == tux->get_tile_pos().x && 
-              level->y == tux->get_tile_pos().y)
+        std::cout << "No level to enter at: "
+          << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
+        return;
+        }
+
+
+          if (level->pos == tux->get_tile_pos())
             {
-              std::cout << "Enter the current level: " << level->name << std::endl;;
-              halt_music();
-              
-              GameSession session(datadir +  "levels/" + level->name,
-                                  1, ST_GL_LOAD_LEVEL_FILE);
+              PlayerStatus old_player_status = player_status;
+
+              std::cout << "Enter the current level: " << level->name << std::endl;
+              // do a shriking fade to the level
+              shrink_fade(Vector((level->pos.x*32 + 16 + offset.x),(level->pos.y*32 + 16
+                      + offset.y)), 500);
+              GameSession session(level->name,
+                                  ST_GL_LOAD_LEVEL_FILE, level->vertical_flip,
+                                  &level->statistics);
 
               switch (session.run())
                 {
-                case GameSession::LEVEL_FINISHED:
-                  level->solved = true;
+                case GameSession::ES_LEVEL_FINISHED:
+                  {
+                    level_finished = true;
+                    bool old_level_state = level->solved;
+                    level->solved = true;
+
+                    // deal with statistics
+                    level->statistics.merge(global_stats);
+                    calculate_total_stats();
+
+                    if (session.get_current_sector()->player->got_power !=
+                          session.get_current_sector()->player->NONE_POWER)
+                      player_status.bonus = PlayerStatus::FLOWER_BONUS;
+                    else if (session.get_current_sector()->player->size == BIG)
+                      player_status.bonus = PlayerStatus::GROWUP_BONUS;
+                    else
+                      player_status.bonus = PlayerStatus::NO_BONUS;
+
+                    if (old_level_state != level->solved && level->auto_path)
+                      { // Try to detect the next direction to which we should walk
+                        // FIXME: Mostly a hack
+                        Direction dir = D_NONE;
+                    
+                        Tile* tile = at(tux->get_tile_pos());
+
+                        if (tile->north && tux->back_direction != D_NORTH)
+                          dir = D_NORTH;
+                        else if (tile->south && tux->back_direction != D_SOUTH)
+                          dir = D_SOUTH;
+                        else if (tile->east && tux->back_direction != D_EAST)
+                          dir = D_EAST;
+                        else if (tile->west && tux->back_direction != D_WEST)
+                          dir = D_WEST;
+
+                        if (dir != D_NONE)
+                          {
+                            tux->set_direction(dir);
+                            //tux->update(delta);
+                          }
+
+                        std::cout << "Walk to dir: " << dir << std::endl;
+                      }
+                  }
+
                   break;
-                case GameSession::LEVEL_ABORT:
-                  // Reseting the player_status might be a worthy
-                  // consideration, but I don't think we need it
-                  // 'cause only the bad players will use it to
-                  // 'cheat' a few items and that isn't necesarry a
-                  // bad thing (ie. better they continue that way,
-                  // then stop playing the game all together since it
-                  // is to hard)
+                case GameSession::ES_LEVEL_ABORT:
+                  level_finished = false;
+                  /* In case the player's abort the level, keep it using the old
+                      status. But the minimum lives and no bonus. */
+                  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::GAME_OVER:
+                case GameSession::ES_GAME_OVER:
+                  {
+                  level_finished = false;
+                  /* draw an end screen */
+                  /* TODO: in the future, this should make a dialog a la SuperMario, asking
+                  if the player wants to restart the world map with no score and from
+                  level 1 */
+                  char str[80];
+
+                  DrawingContext context;
+                  context.draw_gradient(Color (200,240,220), Color(200,200,220),
+                      LAYER_BACKGROUND0);
+
+                  context.draw_text(blue_text, _("GAMEOVER"), 
+                      Vector(screen->w/2, 200), CENTER_ALLIGN, LAYER_FOREGROUND1);
+
+                  sprintf(str, _("COINS: %d"), player_status.distros);
+                  context.draw_text(gold_text, str,
+                      Vector(screen->w/2, screen->w - 32), CENTER_ALLIGN, LAYER_FOREGROUND1);
+
+                  total_stats.draw_message_info(context, _("Total Statistics"));
+
+                  context.do_drawing();
+  
+                  SDL_Event event;
+                  wait_for_event(event,2000,6000,true);
+
                   quit = true;
+                  player_status.reset();
                   break;
-                case GameSession::NONE:
+                  }
+                case GameSession::ES_NONE:
+                  assert(false);
                   // Should never be reached 
                   break;
                 }
 
-              play_music(song);
+              SoundManager::get()->play_music(song);
               Menu::set_current(0);
               if (!savegame_file.empty())
                 savegame(savegame_file);
-              return;
             }
-        }
-      else
+      /* The porpose of the next checking is that if the player lost
+         the level (in case there is one), don't show anything */
+      if(level_finished)
         {
-          std::cout << "Nothing to enter at: "
-                    << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
+        if (!level->extro_filename.empty())
+          {
+          // Display a text file
+          display_text_file(level->extro_filename, SCROLL_SPEED_MESSAGE, white_big_text , white_text, white_small_text, blue_text );
+          }
+
+        if (!level->next_worldmap.empty())
+          {
+          // Load given worldmap
+          loadmap(level->next_worldmap);
+          }
+        if (level->quit_worldmap)
+          quit = true;
         }
     }
   else
     {
-      tux->set_direction(input_direction);
-      tux->update(0.33f);
+      tux->action(delta);
+//      tux->set_direction(input_direction);
     }
   
   Menu* menu = Menu::current();
@@ -610,14 +1006,9 @@ WorldMap::update()
         {
           switch (worldmap_menu->check())
             {
-            case 2: // Return to game
-              break;
-            case 3:
-              if (!savegame_file.empty())
-                savegame(savegame_file);
+            case MNID_RETURNWORLDMAP: // Return to game
               break;
-                
-            case 6: // Quit Worldmap
+            case MNID_QUITWORLDMAP: // Quit Worldmap
               quit = true;
               break;
             }
@@ -630,14 +1021,16 @@ WorldMap::update()
 }
 
 Tile*
-WorldMap::at(Point p)
+WorldMap::at(Vector p)
 {
   assert(p.x >= 0 
          && p.x < width
          && p.y >= 0
          && p.y < height);
 
-  return TileManager::instance()->get(tilemap[width * p.y + p.x]);
+  int x = int(p.x);
+  int y = int(p.y);
+  return tile_manager->get(tilemap[width * y + x]);
 }
 
 WorldMap::Level*
@@ -645,8 +1038,19 @@ WorldMap::at_level()
 {
   for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
     {
-      if (i->x == tux->get_tile_pos().x && 
-          i->y == tux->get_tile_pos().y)
+      if (i->pos == tux->get_tile_pos())
+        return &*i; 
+    }
+
+  return 0;
+}
+
+WorldMap::SpecialTile*
+WorldMap::at_special_tile()
+{
+  for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
+    {
+      if (i->pos == tux->get_tile_pos())
         return &*i; 
     }
 
@@ -655,67 +1059,115 @@ WorldMap::at_level()
 
 
 void
-WorldMap::draw(const Point& offset)
+WorldMap::draw(DrawingContext& context, const Vector& offset)
 {
   for(int y = 0; y < height; ++y)
     for(int x = 0; x < width; ++x)
       {
-        Tile* tile = at(Point(x, y));
-        tile->sprite->draw(x*32 + offset.x,
-                           y*32 + offset.y);
+        Tile* tile = at(Vector(x, y));
+        tile->draw(context, Vector(x*32 + offset.x, y*32 + offset.y));
       }
-  
+
   for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
     {
       if (i->solved)
-        leveldot_green->draw(i->x*32 + offset.x, 
-                             i->y*32 + offset.y);
+        context.draw_surface(leveldot_green,
+            Vector(i->pos.x*32 + offset.x, i->pos.y*32 + offset.y), LAYER_TILES+1);
       else
-        leveldot_red->draw(i->x*32 + offset.x, 
-                           i->y*32 + offset.y);        
+        context.draw_surface(leveldot_red,
+            Vector(i->pos.x*32 + offset.x, i->pos.y*32 + offset.y), LAYER_TILES+1);
+    }
+
+  for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
+    {
+      if(i->invisible)
+        continue;
+
+      if (i->teleport_dest != Vector(-1, -1))
+        context.draw_surface(teleporterdot,
+                Vector(i->pos.x*32 + offset.x, i->pos.y*32 + offset.y), LAYER_TILES+1);
+
+      else if (!i->map_message.empty() && !i->passive_message)
+        context.draw_surface(messagedot,
+                Vector(i->pos.x*32 + offset.x, i->pos.y*32 + offset.y), LAYER_TILES+1);
     }
 
-  tux->draw(offset);
-  draw_status();
+  tux->draw(context, offset);
+  draw_status(context);
 }
 
 void
-WorldMap::draw_status()
+WorldMap::draw_status(DrawingContext& context)
 {
   char str[80];
-  sprintf(str, "%d", player_status.score);
-  white_text->draw("SCORE", 0, 0);
-  gold_text->draw(str, 96, 0);
+  sprintf(str, " %d", total_stats.get_points(SCORE_STAT));
+
+  context.draw_text(white_text, _("SCORE"), Vector(0, 0), LEFT_ALLIGN, LAYER_FOREGROUND1);
+  context.draw_text(gold_text, str, Vector(96, 0), LEFT_ALLIGN, LAYER_FOREGROUND1);
 
   sprintf(str, "%d", player_status.distros);
-  white_text->draw_align("COINS", 320-64, 0,  A_LEFT, A_TOP);
-  gold_text->draw_align(str, 320+64, 0, A_RIGHT, A_TOP);
+  context.draw_text(white_text, _("COINS"), Vector(screen->w/2 - 16*5, 0),
+      LEFT_ALLIGN, LAYER_FOREGROUND1);
+  context.draw_text(gold_text, str, Vector(screen->w/2 + (16*5)/2, 0),
+        LEFT_ALLIGN, LAYER_FOREGROUND1);
 
-  white_text->draw("LIVES", 480, 0);
   if (player_status.lives >= 5)
     {
       sprintf(str, "%dx", player_status.lives);
-      gold_text->draw(str, 585, 0);
-      tux_life->draw(565+(18*3), 0);
+      context.draw_text(gold_text, str, 
+          Vector(screen->w - gold_text->get_text_width(str) - tux_life->w, 0),
+          LEFT_ALLIGN, LAYER_FOREGROUND1);
+      context.draw_surface(tux_life, Vector(screen->w -
+            gold_text->get_text_width("9"), 0), LEFT_ALLIGN, LAYER_FOREGROUND1);
     }
   else
     {
       for(int i= 0; i < player_status.lives; ++i)
-        tux_life->draw(565+(18*i),0);
+        context.draw_surface(tux_life,
+            Vector(screen->w - tux_life->w*4 + (tux_life->w*i), 0),
+            LAYER_FOREGROUND1);
     }
+  context.draw_text(white_text, _("LIVES"),
+      Vector(screen->w - white_text->get_text_width(_("LIVES")) - white_text->get_text_width("   99"), 0),
+      LEFT_ALLIGN, LAYER_FOREGROUND1);
 
   if (!tux->is_moving())
     {
       for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
         {
-          if (i->x == tux->get_tile_pos().x && 
-              i->y == tux->get_tile_pos().y)
+          if (i->pos == tux->get_tile_pos())
             {
-              white_text->draw_align(i->title.c_str(), screen->w/2, screen->h,  A_HMIDDLE, A_BOTTOM);
+              if(i->title == "")
+                get_level_title(*i);
+
+              context.draw_text(white_text, i->title, 
+                  Vector(screen->w/2,
+                         screen->h - white_text->get_height() - 30),
+                  CENTER_ALLIGN, LAYER_FOREGROUND1);
+
+              i->statistics.draw_worldmap_info(context);
+              break;
+            }
+        }
+      for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
+        {
+          if (i->pos == tux->get_tile_pos())
+            {
+               /* Display an in-map message in the map, if any as been selected */
+              if(!i->map_message.empty() && !i->passive_message)
+                context.draw_text(gold_text, i->map_message, 
+                    Vector(screen->w/2,
+                           screen->h - white_text->get_height() - 60),
+                    CENTER_ALLIGN, LAYER_FOREGROUND1);
               break;
             }
         }
     }
+  /* Display a passive message in the map, if needed */
+  if(passive_message_timer.check())
+    context.draw_text(gold_text, passive_message, 
+            Vector(screen->w/2, screen->h - white_text->get_height() - 60),
+            CENTER_ALLIGN, LAYER_FOREGROUND1);
 }
 
 void
@@ -725,78 +1177,117 @@ WorldMap::display()
 
   quit = false;
 
-  song = load_song(datadir +  "/music/" + music);
-  if(!song)
-    st_abort("Couldn't load song ", music.c_str());
+  song = SoundManager::get()->load_music(datadir +  "/music/" + music);
+  SoundManager::get()->play_music(song);
 
-  play_music(song);
+  FrameRate frame_rate(10);
+  frame_rate.set_frame_limit(false);
 
-  while(!quit) {
-    Point tux_pos = tux->get_pos();
-    if (1)
-      {
-        offset.x = -tux_pos.x + screen->w/2;
-        offset.y = -tux_pos.y + screen->h/2;
+  frame_rate.start();
+  frame_timer.start(.25, true);
 
-        if (offset.x > 0) offset.x = 0;
-        if (offset.y > 0) offset.y = 0;
+  DrawingContext context;
+  while(!quit)
+    {
+      float delta = frame_rate.get();
 
-        if (offset.x < screen->w - width*32) offset.x = screen->w - width*32;
-        if (offset.y < screen->h - height*32) offset.y = screen->h - height*32;
-      } 
+      delta *= 1.3f;
 
-    draw(offset);
-    get_input();
-    update();
+      if (delta > 10.0f)
+        delta = .3f;
+       
+      frame_rate.update();
 
-  if(Menu::current())
-    {
-      Menu::current()->draw();
-      mouse_cursor->draw();
-    }
-    flipscreen();
+      Vector tux_pos = tux->get_pos();
+      if (1)
+        {
+          offset.x = -tux_pos.x + screen->w/2;
+          offset.y = -tux_pos.y + screen->h/2;
 
-    SDL_Delay(20);
-  }
+          if (offset.x > 0) offset.x = 0;
+          if (offset.y > 0) offset.y = 0;
+
+          if (offset.x < screen->w - width*32) offset.x = screen->w - width*32;
+          if (offset.y < screen->h - height*32) offset.y = screen->h - height*32;
+        } 
 
-  halt_music();
-  free_music(song);
+      draw(context, offset);
+      get_input();
+      update(delta);
+      
+      if(Menu::current())
+        {
+          Menu::current()->draw(context);
+          mouse_cursor->draw(context);
+        }
+
+      context.do_drawing();
+
+      SDL_Delay(20);
+    }
 }
 
 void
 WorldMap::savegame(const std::string& filename)
 {
+  if(filename == "")
+    return;
+
   std::cout << "savegame: " << filename << std::endl;
-  std::ofstream out(filename.c_str());
 
-  int nb_solved_levels = 0;
+   std::ofstream file(filename.c_str(), std::ios::out);
+   LispWriter* writer = new LispWriter(file);
+
+  int nb_solved_levels = 0, total_levels = 0;
   for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
     {
+      ++total_levels;
       if (i->solved)
         ++nb_solved_levels;
     }
+  char nb_solved_levels_str[80], total_levels_str[80];
+  sprintf(nb_solved_levels_str, "%d", nb_solved_levels);
+  sprintf(total_levels_str, "%d", total_levels);
+
+  writer->write_comment("Worldmap save file");
+
+  writer->start_list("supertux-savegame");
+
+  writer->write_int("version", 1);
+  writer->write_string("title", std::string(name + " - " + nb_solved_levels_str + "/" + total_levels_str));
+  writer->write_string("map", map_filename);
+  writer->write_int("lives", player_status.lives);
+  writer->write_int("distros", player_status.lives);
+  writer->write_int("max-score-multiplier", player_status.max_score_multiplier);
+
+  writer->start_list("tux");
+
+  writer->write_float("x", tux->get_tile_pos().x);
+  writer->write_float("y", tux->get_tile_pos().y);
+  writer->write_string("back", direction_to_string(tux->back_direction));
+  writer->write_string("bonus", bonus_to_string(player_status.bonus));
+
+  writer->end_list("tux");
+
+  writer->start_list("levels");
 
-  out << "(supertux-savegame\n"
-      << "  (version 1)\n"
-      << "  (title  \"Icyisland - " << nb_solved_levels << "/" << levels.size() << "\")\n"
-      << "  (lives   " << player_status.lives << ")\n"
-      << "  (score   " << player_status.score << ")\n"
-      << "  (distros " << player_status.distros << ")\n"
-      << "  (tux     (x " << tux->get_tile_pos().x << ") (y " << tux->get_tile_pos().y << ")"
-      << " (back \"" << direction_to_string(tux->back_direction) << "\"))\n"
-      << "  (levels\n";
-  
   for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
     {
       if (i->solved)
         {
-          out << "     (level (name \"" << i->name << "\")\n"
-              << "            (solved #t))\n";
+        writer->start_list("level");
+
+        writer->write_string("name", i->name);
+        writer->write_bool("solved", true);
+        i->statistics.write(*writer);
+
+        writer->end_list("level");
         }
     }  
 
-  out << "   )\n"
-      << " )\n\n;; EOF ;;" << std::endl;
+  writer->end_list("levels");
+
+  writer->end_list("supertux-savegame");
 }
 
 void
@@ -805,66 +1296,108 @@ WorldMap::loadgame(const std::string& filename)
   std::cout << "loadgame: " << filename << std::endl;
   savegame_file = filename;
 
-  if (access(filename.c_str(), F_OK) == 0)
+  if (access(filename.c_str(), F_OK) != 0)
     {
-      lisp_object_t* cur = lisp_read_from_file(filename);
+    load_map();
 
-      if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0)
-        return;
+    player_status.reset();
 
-      cur = lisp_cdr(cur);
-      LispReader reader(cur);
+    return;
+    }
   
-      reader.read_int("lives",  &player_status.lives);
-      reader.read_int("score",  &player_status.score);
-      reader.read_int("distros", &player_status.distros);
+  lisp_object_t* savegame = lisp_read_from_file(filename);
+  if (!savegame)
+    {
+      std::cout << "WorldMap:loadgame: File not found: " << filename << std::endl;
+      load_map();
+      return;
+    }
 
-      if (player_status.lives < 0)
-        player_status.lives = START_LIVES;
+  lisp_object_t* cur = savegame;
 
-      lisp_object_t* tux_cur = 0;
-      if (reader.read_lisp("tux", &tux_cur))
-        {
-          Point p;
-          std::string back_str = "none";
+  if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0)
+    {
+    load_map();
+    return;
+    }
 
-          LispReader tux_reader(tux_cur);
-          tux_reader.read_int("x", &p.x);
-          tux_reader.read_int("y", &p.y);
-          tux_reader.read_string("back", &back_str);
-          
-          tux->back_direction = string_to_direction(back_str);      
-          tux->set_tile_pos(p);
-        }
+  cur = lisp_cdr(cur);
+  LispReader reader(cur);
+
+  /* Get the Map filename and then load it before setting level settings */
+  std::string cur_map_filename = map_filename;
+  reader.read_string("map", map_filename);
+//  if(cur_map_filename != map_filename)
+    load_map(); 
+
+  reader.read_int("lives", player_status.lives);
+  reader.read_int("distros", player_status.distros);
+  reader.read_int("max-score-multiplier", player_status.max_score_multiplier);
+
+  if (player_status.lives < 0)
+    player_status.lives = START_LIVES;
+
+  lisp_object_t* tux_cur = 0;
+  if (reader.read_lisp("tux", tux_cur))
+    {
+      Vector p;
+      std::string back_str = "none";
+      std::string bonus_str = "none";
+
+      LispReader tux_reader(tux_cur);
+      tux_reader.read_float("x", p.x);
+      tux_reader.read_float("y", p.y);
+      tux_reader.read_string("back", back_str);
+      tux_reader.read_string("bonus", bonus_str);
+      
+      player_status.bonus = string_to_bonus(bonus_str);
+      tux->back_direction = string_to_direction(back_str);      
+      tux->set_tile_pos(p);
+    }
 
-      lisp_object_t* level_cur = 0;
-      if (reader.read_lisp("levels", &level_cur))
+  lisp_object_t* level_cur = 0;
+  if (reader.read_lisp("levels", level_cur))
+    {
+      while(level_cur)
         {
-          while(level_cur)
-            {
-              lisp_object_t* sym  = lisp_car(lisp_car(level_cur));
-              lisp_object_t* data = lisp_cdr(lisp_car(level_cur));
+          lisp_object_t* sym  = lisp_car(lisp_car(level_cur));
+          lisp_object_t* data = lisp_cdr(lisp_car(level_cur));
 
-              if (strcmp(lisp_symbol(sym), "level") == 0)
-                {
-                  std::string name;
-                  bool solved = false;
+          if (strcmp(lisp_symbol(sym), "level") == 0)
+            {
+              std::string name;
+              bool solved = false;
 
-                  LispReader level_reader(data);
-                  level_reader.read_string("name",   &name);
-                  level_reader.read_bool("solved", &solved);
+              LispReader level_reader(data);
+              level_reader.read_string("name", name);
+              level_reader.read_bool("solved", solved);
 
-                  for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+              for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+                {
+                  if (name == i->name)
                     {
-                      if (name == i->name)
-                        i->solved = solved;
+                    i->solved = solved;
+                    i->statistics.parse(level_reader);
+                    break;
                     }
                 }
-
-              level_cur = lisp_cdr(level_cur);
             }
+
+          level_cur = lisp_cdr(level_cur);
         }
     }
+  lisp_free(savegame);
+
+  calculate_total_stats();
+}
+
+void
+WorldMap::loadmap(const std::string& filename)
+{
+  savegame_file = "";
+  map_filename = filename;
+  load_map();
 }
 
 } // namespace WorldMapNS