-converted remaining classes to GameObject
[supertux.git] / src / level.cpp
index cc40d46..4bdf885 100644 (file)
@@ -1,50 +1,68 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2004 SuperTux Development Team, see AUTHORS for details
 //
-// C Implementation: level
-//
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2003
-//
-// Copyright: See COPYING file that comes with this distribution
-//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
 //
+//  This program is distributed in the hope that it will be useful,
+//  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
+//  02111-1307, USA.
 
 #include <map>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <iostream>
+#include <fstream>
 #include "globals.h"
 #include "setup.h"
 #include "screen.h"
 #include "level.h"
 #include "physic.h"
 #include "scene.h"
+#include "tile.h"
 #include "lispreader.h"
+#include "resources.h"
+#include "music_manager.h"
+#include "gameobjs.h"
+#include "world.h"
+#include "lispwriter.h"
 
 using namespace std;
 
-texture_type img_bkgd, img_bkgd_tile[2][4], img_solid[4], img_brick[2];
+LevelSubset::LevelSubset()
+    : image(0), levels(0)
+{
+}
 
-st_subset::st_subset()
+LevelSubset::~LevelSubset()
 {
-  levels = 0;
+  delete image;
 }
 
-void st_subset::create(const std::string& subset_name)
+void LevelSubset::create(const std::string& subset_name)
 {
-  st_level new_lev;
-  st_subset new_subset;
+  Level new_lev;
+  LevelSubset new_subset;
   new_subset.name = subset_name;
   new_subset.title = "Unknown Title";
   new_subset.description = "No description so far.";
   new_subset.save();
-  level_default(&new_lev);
-  level_save(&new_lev,subset_name.c_str(),1);
+  new_lev.init_defaults();
+  new_lev.save(subset_name, 1, 0);
 }
 
-void st_subset::parse (lisp_object_t* cursor)
+void LevelSubset::parse (lisp_object_t* cursor)
 {
   while(!lisp_nil_p(cursor))
     {
@@ -76,7 +94,7 @@ void st_subset::parse (lisp_object_t* cursor)
     }
 }
 
-void st_subset::load(char *subset)
+void LevelSubset::load(char *subset)
 {
   FILE* fi;
   char filename[1024];
@@ -118,17 +136,20 @@ void st_subset::load(char *subset)
 
         }
 
+      lisp_free(root_obj);
       fclose(fi);
 
       snprintf(str, 1024, "%s.png", filename);
       if(faccessible(str))
         {
-          texture_load(&image,str,IGNORE_ALPHA);
+          delete image;
+          image = new Surface(str,IGNORE_ALPHA);
         }
       else
         {
           snprintf(filename, 1024, "%s/images/status/level-subset-info.png", datadir.c_str());
-          texture_load(&image,filename,IGNORE_ALPHA);
+          delete image;
+          image = new Surface(filename,IGNORE_ALPHA);
         }
     }
 
@@ -146,7 +167,7 @@ void st_subset::load(char *subset)
   levels = --i;
 }
 
-void st_subset::save()
+void LevelSubset::save()
 {
   FILE* fi;
   string filename;
@@ -182,130 +203,173 @@ void st_subset::save()
     }
 }
 
-void st_subset::free()
+Level::Level()
+  : img_bkgd(0)
 {
-  title.clear();
-  description.clear();
-  name.clear();
-  texture_free(&image);
-  levels = 0;
+  init_defaults();
 }
 
-void level_default(st_level* plevel)
+Level::~Level()
 {
-  int i,y;
-  plevel->name = "UnNamed";
-  plevel->theme = "antarctica";
-  plevel->song_title = "Mortimers_chipdisko.mod";
-  plevel->bkgd_image = "arctis.png";
-  plevel->width = 21;
-  plevel->time_left = 100;
-  plevel->gravity = 10.;
-  plevel->bkgd_red = 0;
-  plevel->bkgd_green = 0;
-  plevel->bkgd_blue = 0;
-
-  for(i = 0; i < 15; ++i)
-    {
-      plevel->ia_tiles[i] = (unsigned int*) malloc((plevel->width+1)*sizeof(unsigned int));
-      plevel->ia_tiles[i][plevel->width] = (unsigned int) '\0';
-      for(y = 0; y < plevel->width; ++y)
-        plevel->ia_tiles[i][y] = (unsigned int) '.';
-      plevel->ia_tiles[i][plevel->width] = (unsigned int) '\0';
-
-      plevel->bg_tiles[i] = (unsigned int*) malloc((plevel->width+1)*sizeof(unsigned int));
-      plevel->bg_tiles[i][plevel->width] = (unsigned int) '\0';
-      for(y = 0; y < plevel->width; ++y)
-        plevel->bg_tiles[i][y] = (unsigned int) '.';
-      plevel->bg_tiles[i][plevel->width] = (unsigned int) '\0';
-
-      plevel->fg_tiles[i] = (unsigned int*) malloc((plevel->width+1)*sizeof(unsigned int));
-      plevel->fg_tiles[i][plevel->width] = (unsigned int) '\0';
-      for(y = 0; y < plevel->width; ++y)
-        plevel->fg_tiles[i][y] = (unsigned int) '.';
-      plevel->fg_tiles[i][plevel->width] = (unsigned int) '\0';
-
-      plevel->dn_tiles[i] = (unsigned int*) malloc((plevel->width+1)*sizeof(unsigned int));
-      plevel->dn_tiles[i][plevel->width] = (unsigned int) '\0';
-      for(y = 0; y < plevel->width; ++y)
-        plevel->dn_tiles[i][y] = (unsigned int) '.';
-      plevel->dn_tiles[i][plevel->width] = (unsigned int) '\0';
-    }
+  delete img_bkgd;
 }
 
-/* Load data for this level: */
-/* Returns -1, if the loading of the level failed. */
-int level_load(st_level* plevel, const  char *subset, int level)
+void
+Level::init_defaults()
 {
-  char filename[1024];
+  name       = "UnNamed";
+  author     = "UnNamed";
+  song_title = "Mortimers_chipdisko.mod";
+  bkgd_image = "arctis.png";
+  width      = 0;
+  height     = 0;
+  start_pos_x = 100;
+  start_pos_y = 170;
+  time_left  = 100;
+  gravity    = 10.;
+  back_scrolling = false;
+  hor_autoscroll_speed = 0;
+  bkgd_speed = 50;
+  bkgd_top.red   = 0;
+  bkgd_top.green = 0;
+  bkgd_top.blue  = 0;
+  bkgd_bottom.red   = 255;
+  bkgd_bottom.green = 255;
+  bkgd_bottom.blue  = 255;
+
+  resize(21, 19);
+}
 
-  /* Load data file: */
+int
+Level::load(const std::string& subset, int level, World* world)
+{
+  char filename[1024];
 
-  snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset, level);
+  // Load data file:
+  snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset.c_str(), level);
   if(!faccessible(filename))
-    snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset, level);
+    snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset.c_str(), level);
 
-  return level_load(plevel, filename);
+  return load(filename, world);
 }
 
-int level_load(st_level* plevel, const char* filename)
+int 
+Level::load(const std::string& filename, World* world)
 {
-  FILE * fi;
-  lisp_object_t* root_obj = 0;
-  fi = fopen(filename, "r");
-  if (fi == NULL)
+  lisp_object_t* root_obj = lisp_read_from_file(filename);
+  if (!root_obj)
     {
-      perror(filename);
+      std::cout << "Level: Couldn't load file: " << filename << std::endl;
       return -1;
     }
 
-  lisp_stream_t stream;
-  lisp_stream_init_file (&stream, fi);
-  root_obj = lisp_read (&stream);
-
   if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR)
     {
-      printf("World: Parse Error in file %s", filename);
+      printf("World: Parse Error in file %s", filename.c_str());
+      return -1;
     }
 
-  vector<int> ia_tm;
-  vector<int> dn_tm;
-  vector<int> bg_tm;
-  vector<int> fg_tm;
-
   int version = 0;
   if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0)
     {
       LispReader reader(lisp_cdr(root_obj));
-
+      version = 0;
       reader.read_int("version",  &version);
-      reader.read_int("width",  &plevel->width);
-      reader.read_int("time",  &plevel->time_left);
-      reader.read_int("bkgd_red",  &plevel->bkgd_red);
-      reader.read_int("bkgd_green",  &plevel->bkgd_green);
-      reader.read_int("bkgd_blue",  &plevel->bkgd_blue);
-      reader.read_float("gravity",  &plevel->gravity);
-      reader.read_string("name",  &plevel->name);
-      reader.read_string("theme",  &plevel->theme);
-      reader.read_string("music",  &plevel->song_title);
-      reader.read_string("background",  &plevel->bkgd_image);
-      reader.read_string("particle_system", &plevel->particle_system);
-      reader.read_int_vector("background-tm",  &bg_tm);
-
-      if (!reader.read_int_vector("interactive-tm", &ia_tm))
-        reader.read_int_vector("tilemap", &ia_tm);
-
-      reader.read_int_vector("dynamic-tm",     &dn_tm);
-      reader.read_int_vector("foreground-tm",  &fg_tm);
-
+      if(!reader.read_int("width",  &width))
+        st_abort("No width specified for level.", "");
+      if (!reader.read_int("start_pos_x", &start_pos_x)) start_pos_x = 100;
+      if (!reader.read_int("start_pos_y", &start_pos_y)) start_pos_y = 170;
+      time_left = 500;
+      if(!reader.read_int("time",  &time_left)) {
+        printf("Warning no time specified for level.\n");
+      }
+      
+      height = 15;
+      reader.read_int("height",  &height);
+      
+      back_scrolling = false;
+      reader.read_bool("back_scrolling",  &back_scrolling);
+
+      hor_autoscroll_speed = 0;
+      reader.read_float("hor_autoscroll_speed",  &hor_autoscroll_speed);
+      
+      bkgd_speed = 50;
+      reader.read_int("bkgd_speed",  &bkgd_speed);
+
+      
+      bkgd_top.red = bkgd_top.green = bkgd_top.blue = 0;
+      reader.read_int("bkgd_red_top",  &bkgd_top.red);
+      reader.read_int("bkgd_green_top",  &bkgd_top.green);
+      reader.read_int("bkgd_blue_top",  &bkgd_top.blue);
+
+      bkgd_bottom.red = bkgd_bottom.green = bkgd_bottom.blue = 0;
+      reader.read_int("bkgd_red_bottom",  &bkgd_bottom.red);
+      reader.read_int("bkgd_green_bottom",  &bkgd_bottom.green);
+      reader.read_int("bkgd_blue_bottom",  &bkgd_bottom.blue);
+
+      gravity = 10;
+      reader.read_float("gravity",  &gravity);
+      name = "Noname";
+      reader.read_string("name",  &name);
+      author = "unknown author";
+      reader.read_string("author", &author);
+      song_title = "";
+      reader.read_string("music",  &song_title);
+      bkgd_image = "";
+      reader.read_string("background",  &bkgd_image);
+      particle_system = "";
+      reader.read_string("particle_system", &particle_system);
+
+      reader.read_int_vector("background-tm",  &bg_tiles);
+      if(int(bg_tiles.size()) != width * height)
+        st_abort("Wrong size of backgroundtilemap", "");
+
+      if (!reader.read_int_vector("interactive-tm", &ia_tiles))
+        reader.read_int_vector("tilemap", &ia_tiles);
+      if(int(ia_tiles.size()) != width * height)
+        st_abort("Wrong size of interactivetilemap", "");      
+
+      reader.read_int_vector("foreground-tm",  &fg_tiles);
+      if(int(fg_tiles.size()) != width * height)
+        st_abort("Wrong size of foregroundtilemap", "");      
+
+      { // Read ResetPoints
+        lisp_object_t* cur = 0;
+        if (reader.read_lisp("reset-points",  &cur))
+          {
+            while (!lisp_nil_p(cur))
+              {
+                lisp_object_t* data = lisp_car(cur);
+
+                ResetPoint pos;
+
+                LispReader reader(lisp_cdr(data));
+                if (reader.read_int("x", &pos.x)
+                    && reader.read_int("y", &pos.y))
+                  {
+                    reset_points.push_back(pos);
+                  }
+
+                cur = lisp_cdr(cur);
+              }
+          }
+      }
+
+      { // Read BadGuys
+        lisp_object_t* cur = 0;
+        if (reader.read_lisp("objects",  &cur))
+          {
+            if(world)
+              world->parse_objects(cur);
+          }
+      }
+
+#if 0 // TODO fix this or remove it
       // Convert old levels to the new tile numbers
       if (version == 0)
         {
           std::map<char, int> transtable;
           transtable['.'] = 0;
-          transtable['0'] = 1000;
-          transtable['1'] = 1001;
-          transtable['2'] = 1002;
           transtable['x'] = 104;
           transtable['X'] = 77;
           transtable['y'] = 78;
@@ -332,9 +396,9 @@ int level_load(st_level* plevel, const char* filename)
           transtable['h'] = 98;
           transtable['i'] = 99;
           transtable['j'] = 100
-            ;
+                            ;
           transtable['#'] = 11;
-          transtable['['] = 13; 
+          transtable['['] = 13;
           transtable['='] = 14;
           transtable[']'] = 15;
           transtable['$'] = 82;
@@ -344,257 +408,150 @@ int level_load(st_level* plevel, const char* filename)
           transtable['\\'] = 81;
           transtable['&'] = 75;
 
+          int x = 0;
+          int y = 0;
           for(std::vector<int>::iterator i = ia_tm.begin(); i != ia_tm.end(); ++i)
             {
-              std::map<char, int>::iterator j = transtable.find(*i);
-              if (j != transtable.end())
-                *i = j->second;
+              if (*i == '0' || *i == '1' || *i == '2')
+                {
+                  badguy_data.push_back(BadGuyData(static_cast<BadGuyKind>(*i-'0'),
+                                                   x*32, y*32, false));
+                  *i = 0;
+                }
               else
-                printf("Error: conversion will fail, unsupported char: '%c' (%d)\n", *i, *i);
+                {
+                  std::map<char, int>::iterator j = transtable.find(*i);
+                  if (j != transtable.end())
+                    *i = j->second;
+                  else
+                    printf("Error: conversion will fail, unsupported char: '%c' (%d)\n", *i, *i);
+                }
+              ++x;
+              if (x >= width)
+                {
+                  x = 0;
+                  ++y;
+                }
             }
         }
+#endif
     }
 
-  for(int i = 0; i < 15; ++i)
-    {
-      plevel->dn_tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) );
-      plevel->ia_tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) );
-      plevel->bg_tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) );
-      plevel->fg_tiles[i] = (unsigned int*) calloc((plevel->width +1) , sizeof(unsigned int) );
-    }
-
-  int i = 0;
-  int j = 0;
-  for(vector<int>::iterator it = ia_tm.begin(); it != ia_tm.end(); ++it, ++i)
-    {
-      plevel->ia_tiles[j][i] = (*it);
-      if(i == plevel->width - 1)
-        {
-          i = -1;
-          ++j;
-        }
-    }
-
-  i = j = 0;
-  for(vector<int>::iterator it = dn_tm.begin(); it != dn_tm.end(); ++it, ++i)
-    {
-
-      plevel->dn_tiles[j][i] = (*it);
-      if(i == plevel->width - 1)
-        {
-          i = -1;
-          ++j;
-        }
-    }
-
-  i = j = 0;
-  for(vector<int>::iterator it = bg_tm.begin(); it != bg_tm.end(); ++it, ++i)
-    {
-
-      plevel->bg_tiles[j][i] = (*it);
-      if(i == plevel->width - 1)
-        {
-          i = -1;
-          ++j;
-        }
-    }
-
-  i = j = 0;
-  for(vector<int>::iterator it = fg_tm.begin(); it != fg_tm.end(); ++it, ++i)
-    {
-
-      plevel->fg_tiles[j][i] = (*it);
-      if(i == plevel->width - 1)
-        {
-          i = -1;
-          ++j;
-        }
-    }
-
-  /* Set the global gravity to the latest loaded level's gravity */
-  gravity = plevel->gravity;
-
-  /*  Mark the end position of this level! - Is a bit wrong here thought * /
-
-  for (y = 0; y < 15; ++y)
-  {
-  for (x = 0; x < plevel->width; ++x)
-  {
-  if(plevel->tiles[y][x] == '|')
-  {
-  if(x*32 > endpos)
-  endpos = x*32;
-  }
-  }
-  }*/
-
-  fclose(fi);
+  lisp_free(root_obj);
   return 0;
 }
 
 /* Save data for level: */
 
-void level_save(st_level* plevel,const  char * subset, int level)
+void 
+Level::save(const std::string& subset, int level, World* world)
 {
-  FILE * fi;
   char filename[1024];
-  int y,i;
   char str[80];
 
   /* Save data file: */
-  sprintf(str, "/levels/%s/", subset);
+  sprintf(str, "/levels/%s/", subset.c_str());
   fcreatedir(str);
-  snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset, level);
+  snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset.c_str(),
+      level);
   if(!fwriteable(filename))
-    snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset, level);
-
-  fi = fopen(filename, "w");
-  if (fi == NULL)
-    {
-      perror(filename);
-      st_shutdown();
-      exit(-1);
-    }
+    snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(),
+        subset.c_str(), level);
 
+  std::ofstream out(filename);
+  if(!out.good()) {
+    st_abort("Couldn't write file.", filename);
+  }
+  LispWriter writer(out);
 
   /* Write header: */
-  fprintf(fi,";SuperTux-Level\n");
-  fprintf(fi,"(supertux-level\n");
-
-  fprintf(fi,"  (version %d)\n", 1);
-  fprintf(fi,"  (name \"%s\")\n", plevel->name.c_str());
-  fprintf(fi,"  (theme \"%s\")\n", plevel->theme.c_str());
-  fprintf(fi,"  (music \"%s\")\n", plevel->song_title.c_str());
-  fprintf(fi,"  (background \"%s\")\n", plevel->bkgd_image.c_str());
-  fprintf(fi,"  (particle_system \"%s\")\n", plevel->particle_system.c_str());
-  fprintf(fi,"  (bkgd_red %d)\n", plevel->bkgd_red);
-  fprintf(fi,"  (bkgd_green %d)\n", plevel->bkgd_green);
-  fprintf(fi,"  (bkgd_blue %d)\n", plevel->bkgd_blue);
-  fprintf(fi,"  (time %d)\n", plevel->time_left);
-  fprintf(fi,"  (width %d)\n", plevel->width);
-  fprintf(fi,"  (gravity %2.1f)\n", plevel->gravity);
-  fprintf(fi,"  (background-tm ");
-
-  for(y = 0; y < 15; ++y)
-    {
-      for(i = 0; i < plevel->width; ++i)
-        fprintf(fi," %d ", plevel->bg_tiles[y][i]);
-    }
-
-  fprintf( fi,")\n");
-  fprintf(fi,"  (interactive-tm ");
-
-  for(y = 0; y < 15; ++y)
-    {
-      for(i = 0; i < plevel->width; ++i)
-        fprintf(fi," %d ", plevel->ia_tiles[y][i]);
-    }
-
-  fprintf( fi,")\n");
-  fprintf(fi,"  (dynamic-tm ");
-
-  for(y = 0; y < 15; ++y)
-    {
-      for(i = 0; i < plevel->width; ++i)
-        fprintf(fi," %d ", plevel->dn_tiles[y][i]);
-    }
-
-  fprintf( fi,")\n");
-  fprintf(fi,"  (foreground-tm ");
-
-  for(y = 0; y < 15; ++y)
-    {
-      for(i = 0; i < plevel->width; ++i)
-        fprintf(fi," %d ", plevel->fg_tiles[y][i]);
-    }
-
-  fprintf( fi,")");
-  fprintf( fi,")\n");
+  writer.write_comment("SuperTux level made using the built-in leveleditor");
+  writer.start_list("supertux-level");
+
+  writer.write_int("version", 1);
+  writer.write_string("name", name);
+  writer.write_string("author", author);
+  writer.write_string("music", song_title);
+  writer.write_string("background", bkgd_image);
+  writer.write_string("particle_system", particle_system);
+  writer.write_int("bkgd_speed", bkgd_speed);
+  writer.write_int("bkgd_red_top", bkgd_top.red);
+  writer.write_int("bkgd_green_top", bkgd_top.green);
+  writer.write_int("bkgd_blue_top", bkgd_top.blue);
+  writer.write_int("bkgd_red_bottom", bkgd_bottom.red);
+  writer.write_int("bkgd_green_bottom", bkgd_bottom.green);
+  writer.write_int("bkgd_blue_bottom", bkgd_bottom.blue);
+  writer.write_int("time", time_left);
+  writer.write_int("width", width);
+  writer.write_int("height", height);
+  writer.write_bool("back_scrolling", back_scrolling);
+  writer.write_float("hor_autoscroll_speed", hor_autoscroll_speed);
+  writer.write_float("gravity", gravity);
+
+  writer.write_int_vector("background-tm", bg_tiles);
+  writer.write_int_vector("interactive-tm", ia_tiles);
+  writer.write_int_vector("foreground-tm", fg_tiles);
+
+  writer.start_list("reset-points");
+  for(std::vector<ResetPoint>::iterator i = reset_points.begin();
+      i != reset_points.end(); ++i) {
+    writer.start_list("point");
+    writer.write_int("x", i->x);
+    writer.write_int("y", i->y);
+  }
+  writer.end_list("reset-points");
+
+  // write objects
+  writer.start_list("objects");
+  // pick all objects that can be written into a levelfile
+  for(std::vector<GameObject*>::iterator it = world->gameobjects.begin();
+      it != world->gameobjects.end(); ++it) {
+    Serializable* serializable = dynamic_cast<Serializable*> (*it);
+    if(serializable)
+      serializable->write(writer);
+  }
+  writer.end_list("objects");
 
-  fclose(fi);
+  writer.end_list("supertux-level");
+  out.close();
 }
 
-
 /* Unload data for this level: */
-
-void level_free(st_level* plevel)
+void
+Level::cleanup()
 {
-  int i;
-  for(i=0; i < 15; ++i)
-    free(plevel->bg_tiles[i]);
-  for(i=0; i < 15; ++i)
-    free(plevel->ia_tiles[i]);
-  for(i=0; i < 15; ++i)
-    free(plevel->dn_tiles[i]);
-  for(i=0; i < 15; ++i)
-    free(plevel->fg_tiles[i]);
-
-  plevel->name.clear();
-  plevel->theme.clear();
-  plevel->song_title.clear();
-  plevel->bkgd_image.clear();
+  bg_tiles.clear();
+  ia_tiles.clear();
+  fg_tiles.clear();
+
+  reset_points.clear();
+  name = "";
+  author = "";
+  song_title = "";
+  bkgd_image = "";
 }
 
-/* Load graphics: */
-
-void level_load_gfx(st_level *plevel)
+void 
+Level::load_gfx()
 {
-  level_load_image(&img_brick[0],plevel->theme,"brick0.png", IGNORE_ALPHA);
-  level_load_image(&img_brick[1],plevel->theme,"brick1.png", IGNORE_ALPHA);
-
-  level_load_image(&img_solid[0],plevel->theme,"solid0.png", USE_ALPHA);
-  level_load_image(&img_solid[1],plevel->theme,"solid1.png", USE_ALPHA);
-  level_load_image(&img_solid[2],plevel->theme,"solid2.png", USE_ALPHA);
-  level_load_image(&img_solid[3],plevel->theme,"solid3.png", USE_ALPHA);
-
-  level_load_image(&img_bkgd_tile[0][0],plevel->theme,"bkgd-00.png", USE_ALPHA);
-  level_load_image(&img_bkgd_tile[0][1],plevel->theme,"bkgd-01.png", USE_ALPHA);
-  level_load_image(&img_bkgd_tile[0][2],plevel->theme,"bkgd-02.png", USE_ALPHA);
-  level_load_image(&img_bkgd_tile[0][3],plevel->theme,"bkgd-03.png", USE_ALPHA);
-
-  level_load_image(&img_bkgd_tile[1][0],plevel->theme,"bkgd-10.png", USE_ALPHA);
-  level_load_image(&img_bkgd_tile[1][1],plevel->theme,"bkgd-11.png", USE_ALPHA);
-  level_load_image(&img_bkgd_tile[1][2],plevel->theme,"bkgd-12.png", USE_ALPHA);
-  level_load_image(&img_bkgd_tile[1][3],plevel->theme,"bkgd-13.png", USE_ALPHA);
-
-  if(!plevel->bkgd_image.empty())
+  if(!bkgd_image.empty())
     {
       char fname[1024];
-      snprintf(fname, 1024, "%s/background/%s", st_dir, plevel->bkgd_image.c_str());
+      snprintf(fname, 1024, "%s/background/%s", st_dir, bkgd_image.c_str());
       if(!faccessible(fname))
-        snprintf(fname, 1024, "%s/images/background/%s", datadir.c_str(), plevel->bkgd_image.c_str());
-      texture_load(&img_bkgd, fname, IGNORE_ALPHA);
+        snprintf(fname, 1024, "%s/images/background/%s", datadir.c_str(), bkgd_image.c_str());
+      delete img_bkgd;
+      img_bkgd = new Surface(fname, IGNORE_ALPHA);
     }
   else
     {
-      /* Quick hack to make sure an image is loaded, when we are freeing it afterwards. */#
-      level_load_image(&img_bkgd, plevel->theme,"solid0.png", IGNORE_ALPHA);
+      delete img_bkgd;
+      img_bkgd = 0;
     }
 }
 
-/* Free graphics data for this level: */
-
-void level_free_gfx(void)
-{
-  int i;
-
-  for (i = 0; i < 2; i++)
-    {
-      texture_free(&img_brick[i]);
-    }
-  for (i = 0; i < 4; i++)
-    {
-      texture_free(&img_solid[i]);
-      texture_free(&img_bkgd_tile[0][i]);
-      texture_free(&img_bkgd_tile[1][i]);
-    }
-
-  texture_free(&img_bkgd);
-}
-
 /* Load a level-specific graphic... */
-
-void level_load_image(texture_type* ptexture, string theme,const  char * file, int use_alpha)
+void Level::load_image(Surface** ptexture, string theme,const  char * file, int use_alpha)
 {
   char fname[1024];
 
@@ -602,84 +559,138 @@ void level_load_image(texture_type* ptexture, string theme,const  char * file, i
   if(!faccessible(fname))
     snprintf(fname, 1024, "%s/images/themes/%s/%s", datadir.c_str(), theme.c_str(), file);
 
-  texture_load(ptexture, fname, use_alpha);
+  *ptexture = new Surface(fname, use_alpha);
 }
 
-void tilemap_change_size(unsigned int** tilemap[15], int w, int old_w)
+/* Change the size of a level */
+void 
+Level::resize(int new_width, int new_height)
 {
-  int j,y;
-  for(y = 0; y < 15; ++y)
-    {
-      *tilemap[y] = (unsigned int*) realloc(*tilemap[y],(w+1)*sizeof(unsigned int));
-      if(w > old_w)
-        for(j = 0; j < w - old_w; ++j)
-          *tilemap[y][old_w+j] = 0;
-      *tilemap[y][w] = 0;
+  // first: resize height
+  ia_tiles.resize(new_height * width, 0);
+  bg_tiles.resize(new_height * width, 0);
+  fg_tiles.resize(new_height * width, 0);
+  height = new_height;
+
+  // remap horizontal tiles for new width
+  int np = 0;
+  for(int y = 0; y < height; ++y) {
+    for(int x = 0; x < new_width && x < width; ++x) {
+      ia_tiles[np] = ia_tiles[y * width + x];
+      bg_tiles[np] = bg_tiles[y * width + x];
+      fg_tiles[np] = fg_tiles[y * width + x];
+      np++;
     }
-}
-
-/* Change the size of a level (width) */
-void level_change_size (st_level* plevel, int new_width)
-{
-  if(new_width < 21)
-    new_width = 21;
-  tilemap_change_size((unsigned int***)&plevel->ia_tiles,new_width,plevel->width);
-  tilemap_change_size((unsigned int***)&plevel->dn_tiles,new_width,plevel->width);
-  tilemap_change_size((unsigned int***)&plevel->bg_tiles,new_width,plevel->width);
-  tilemap_change_size((unsigned int***)&plevel->fg_tiles,new_width,plevel->width);
-  plevel->width = new_width;
+  }
 
+  ia_tiles.resize(new_height * new_width);
+  bg_tiles.resize(new_height * new_width);
+  fg_tiles.resize(new_height * new_width); 
+  
+  width = new_width;
 }
 
-/* Edit a piece of the map! */
-
-void level_change(st_level* plevel, float x, float y, int tm, unsigned int c)
+void
+Level::change(float x, float y, int tm, unsigned int c)
 {
-  int xx, yy;
-
-  yy = ((int)y / 32);
-  xx = ((int)x / 32);
+  int yy = ((int)y / 32);
+  int xx = ((int)x / 32);
 
-  if (yy >= 0 && yy < 15 && xx >= 0 && xx <= plevel->width)
+  if (yy >= 0 && yy < height && xx >= 0 && xx <= width)
     {
       switch(tm)
         {
-        case 0:
-          plevel->bg_tiles[yy][xx] = c;
-        case 1:
-          plevel->ia_tiles[yy][xx] = c;
-        case 2:
-          plevel->dn_tiles[yy][xx] = c;
-        case 4:
-          plevel->fg_tiles[yy][xx] = c;
+        case TM_BG:
+          bg_tiles[yy * width + xx] = c;
+          break;
+        case TM_IA:
+          ia_tiles[yy * width + xx] = c;
+          break;
+        case TM_FG:
+          fg_tiles[yy * width + xx] = c;
+          break;
         }
     }
 }
 
-/* Free music data for this level: */
-
-void level_free_song(void)
+void Level::draw_bg()
 {
-  free_music(level_song);
-  free_music(level_song_fast);
+  if(img_bkgd)
+    {
+    // Tile background horizontally
+    int sx = (int)((float)scroll_x * ((float)bkgd_speed/100.0f)) % img_bkgd->w;
+    int sy = (int)((float)scroll_y * ((float)bkgd_speed/100.0f)) % img_bkgd->h;
+    for (int x = 0; (x-1)*img_bkgd->w <= screen->w; x++)
+      for (int y = 0; (y-1)*img_bkgd->h <= screen->h; y++)
+        img_bkgd->draw_part(x == 0 ? sx : 0, y == 0 ? sy : 0,
+                   x == 0 ? 0 : (img_bkgd->w * x) - sx, y == 0 ? 0 : (img_bkgd->h * y) - sy,
+                   x == 0 ? img_bkgd->w - sx : img_bkgd->w, y == 0 ? img_bkgd->h - sy : img_bkgd->h);
+    }
+  else
+    {
+    drawgradient(bkgd_top, bkgd_bottom);
+    }
 }
 
-/* Load music: */
-
-void level_load_song(st_level* plevel)
+void
+Level::load_song()
 {
+  char* song_path;
+  char* song_subtitle;
 
-  char * song_path;
-  char * song_subtitle;
-
-  level_song = load_song(datadir + "/music/" + plevel->song_title);
+  level_song = music_manager->load_music(datadir + "/music/" + song_title);
 
   song_path = (char *) malloc(sizeof(char) * datadir.length() +
-                              strlen(plevel->song_title.c_str()) + 8 + 5);
-  song_subtitle = strdup(plevel->song_title.c_str());
+                              strlen(song_title.c_str()) + 8 + 5);
+  song_subtitle = strdup(song_title.c_str());
   strcpy(strstr(song_subtitle, "."), "\0");
-  sprintf(song_path, "%s/music/%s-fast%s", datadir.c_str(), song_subtitle, strstr(plevel->song_title.c_str(), "."));
-  level_song_fast = load_song(song_path);
+  sprintf(song_path, "%s/music/%s-fast%s", datadir.c_str(), 
+          song_subtitle, strstr(song_title.c_str(), "."));
+  if(!music_manager->exists_music(song_path)) {
+    level_song_fast = level_song;
+  } else {
+    level_song_fast = music_manager->load_music(song_path);
+  }
   free(song_subtitle);
   free(song_path);
 }
+
+MusicRef
+Level::get_level_music()
+{
+  return level_song;
+}
+
+MusicRef
+Level::get_level_music_fast()
+{
+  return level_song_fast;
+}
+
+unsigned int 
+Level::gettileid(float x, float y) const
+{
+  int xx, yy;
+  unsigned int c;
+
+  yy = ((int)y / 32);
+  xx = ((int)x / 32);
+
+  if (yy >= 0 && yy < height && xx >= 0 && xx <= width)
+    c = ia_tiles[yy * width + xx];
+  else
+    c = 0;
+
+  return c;
+}
+
+unsigned int
+Level::get_tile_at(int x, int y) const
+{
+  if(x < 0 || x >= width || y < 0 || y >= height)
+    return 0;
+  
+  return ia_tiles[y * width + x];
+}
+
+/* EOF */