try to fix opengl warnings
[supertux.git] / src / level.cpp
index 0a7f7ab..ab90191 100644 (file)
 #include <stdio.h>
 #include <string.h>
 #include <iostream>
+#include <fstream>
 #include "globals.h"
 #include "setup.h"
-#include "screen.h"
+#include "camera.h"
+#include "screen/screen.h"
 #include "level.h"
 #include "physic.h"
 #include "scene.h"
@@ -34,6 +36,9 @@
 #include "resources.h"
 #include "music_manager.h"
 #include "gameobjs.h"
+#include "world.h"
+#include "background.h"
+#include "lispwriter.h"
 
 using namespace std;
 
@@ -56,7 +61,7 @@ void LevelSubset::create(const std::string& subset_name)
   new_subset.description = "No description so far.";
   new_subset.save();
   new_lev.init_defaults();
-  new_lev.save(subset_name, 1);
+  new_lev.save(subset_name, 1, 0);
 }
 
 void LevelSubset::parse (lisp_object_t* cursor)
@@ -206,20 +211,6 @@ Level::Level()
   init_defaults();
 }
 
-Level::Level(const std::string& subset, int level)
-  : img_bkgd(0)
-{
-  if(load(subset, level) < 0)
-    st_abort("Couldn't load level from subset", subset.c_str());
-}
-
-Level::Level(const std::string& filename)
-  : img_bkgd(0)
-{
-  if(load(filename) < 0)
-    st_abort("Couldn't load level " , filename.c_str());
-}
-
 Level::~Level()
 {
   delete img_bkgd;
@@ -231,49 +222,18 @@ Level::init_defaults()
   name       = "UnNamed";
   author     = "UnNamed";
   song_title = "Mortimers_chipdisko.mod";
-  bkgd_image = "arctis.png";
-  width      = 21;
-  height     = 15;
-  start_pos_x = 100;
-  start_pos_y = 170;
+  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;
-
-  bg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
-  ia_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
-  fg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
-
-  for(int i = 0; i < height; ++i)
-    {
-      ia_tiles[i].resize(width+1, 0);
-      ia_tiles[i][width] = (unsigned int) '\0';
 
-      for(int y = 0; y < width; ++y)
-        ia_tiles[i][y] = 0;
-
-      bg_tiles[i].resize(width+1, 0);
-      bg_tiles[i][width] = (unsigned int) '\0';
-      for(int y = 0; y < width; ++y)
-        bg_tiles[i][y] = 0;
-
-      fg_tiles[i].resize(width+1, 0);
-      fg_tiles[i][width] = (unsigned int) '\0';
-      for(int y = 0; y < width; ++y)
-        fg_tiles[i][y] = 0;
-    }
+  resize(21, 19);
 }
 
 int
-Level::load(const std::string& subset, int level)
+Level::load(const std::string& subset, int level, World* world)
 {
   char filename[1024];
 
@@ -282,11 +242,11 @@ Level::load(const std::string& subset, int level)
   if(!faccessible(filename))
     snprintf(filename, 1024, "%s/levels/%s/level%d.stl", datadir.c_str(), subset.c_str(), level);
 
-  return load(filename);
+  return load(filename, world);
 }
 
 int 
-Level::load(const std::string& filename)
+Level::load(const std::string& filename, World* world)
 {
   lisp_object_t* root_obj = lisp_read_from_file(filename);
   if (!root_obj)
@@ -297,14 +257,12 @@ Level::load(const std::string& filename)
 
   if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR)
     {
-      printf("World: Parse Error in file %s", filename.c_str());
+      lisp_free(root_obj);
+      std::cout << "World: Parse Error in file '" << filename
+                << "'.\n";
       return -1;
     }
 
-  vector<int> ia_tm;
-  vector<int> bg_tm;
-  vector<int> fg_tm;
-
   int version = 0;
   if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0)
     {
@@ -313,35 +271,51 @@ Level::load(const std::string& filename)
       reader.read_int("version",  &version);
       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;
+      if (!reader.read_float("start_pos_x", &start_pos.x)) start_pos.x = 100;
+      if (!reader.read_float("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");
+        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);
+      if(!reader.read_int("height",  &height)) {
+        printf("Warning: no height specified for level.\n");
+      }
 
-      hor_autoscroll_speed = 0;
-      reader.read_float("hor_autoscroll_speed",  &hor_autoscroll_speed);
-      
-      bkgd_speed = 50;
-      reader.read_int("bkgd_speed",  &bkgd_speed);
 
+      // read old background stuff
+      int 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);
+      Color bkgd_top, bkgd_bottom;
+      int r, g, b;
+      reader.read_int("bkgd_red_top", &r);
+      reader.read_int("bkgd_green_top",  &g);
+      reader.read_int("bkgd_blue_top",  &b);
+      bkgd_top.red = r;
+      bkgd_top.green = g;
+      bkgd_top.blue = b;
+
+      reader.read_int("bkgd_red_bottom",  &r);
+      reader.read_int("bkgd_green_bottom",  &g);
+      reader.read_int("bkgd_blue_bottom",  &b);
+      bkgd_bottom.red = r;
+      bkgd_bottom.green = g;
+      bkgd_bottom.blue = b;
+
+      std::string bkgd_image;
+      reader.read_string("background",  &bkgd_image);
+
+      if(world) {
+        Background* background = new Background();
+        if(bkgd_image != "")
+          background->set_image(bkgd_image, bkgd_speed);
+        else
+          background->set_gradient(bkgd_top, bkgd_bottom);
 
-      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);
+        world->add_object(background);
+      }
 
       gravity = 10;
       reader.read_float("gravity",  &gravity);
@@ -351,17 +325,21 @@ Level::load(const std::string& filename)
       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_tm);
+      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_tm))
-        reader.read_int_vector("tilemap", &ia_tm);
+      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_tm);
+      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;
@@ -385,164 +363,25 @@ Level::load(const std::string& filename)
           }
       }
 
-      { // Read BadGuys
+      { // Read Objects
         lisp_object_t* cur = 0;
         if (reader.read_lisp("objects",  &cur))
           {
-            while (!lisp_nil_p(cur))
-              {
-                lisp_object_t* data = lisp_car(cur);
-                std::string object_type = "";
-
-                LispReader reader(lisp_cdr(data));
-                reader.read_string("type", &object_type);
-
-                if (object_type == "badguy" || object_type == "")
-                {
-                  BadGuyData bg_data;
-                  bg_data.kind = badguykind_from_string(lisp_symbol(lisp_car(data)));
-                  reader.read_int("x", &bg_data.x);
-                  reader.read_int("y", &bg_data.y);
-                  reader.read_bool("stay-on-platform", &bg_data.stay_on_platform);
-
-                  badguy_data.push_back(bg_data);
-                }
-                else
-                {
-                    if (strcmp(lisp_symbol(lisp_car(data)),"trampoline") == 0)
-                    {
-                      ObjectData<TrampolineData> _trampoline_data;
-
-                      _trampoline_data.type = OBJ_TRAMPOLINE;
-                      reader.read_int("x", &_trampoline_data.x);
-                      reader.read_int("y", &_trampoline_data.y);
-                      reader.read_float("power", &_trampoline_data.type_specific.power);
-
-                      trampoline_data.push_back(_trampoline_data);
-                    }
-                }
-
-                cur = lisp_cdr(cur);
-              }
+            if(world)
+              world->parse_objects(cur);
           }
       }
 
-      // Convert old levels to the new tile numbers
-      if (version == 0)
-        {
-          std::map<char, int> transtable;
-          transtable['.'] = 0;
-          transtable['x'] = 104;
-          transtable['X'] = 77;
-          transtable['y'] = 78;
-          transtable['Y'] = 105;
-          transtable['A'] = 83;
-          transtable['B'] = 102;
-          transtable['!'] = 103;
-          transtable['a'] = 84;
-          transtable['C'] = 85;
-          transtable['D'] = 86;
-          transtable['E'] = 87;
-          transtable['F'] = 88;
-          transtable['c'] = 89;
-          transtable['d'] = 90;
-          transtable['e'] = 91;
-          transtable['f'] = 92;
-
-          transtable['G'] = 93;
-          transtable['H'] = 94;
-          transtable['I'] = 95;
-          transtable['J'] = 96;
-
-          transtable['g'] = 97;
-          transtable['h'] = 98;
-          transtable['i'] = 99;
-          transtable['j'] = 100
-                            ;
-          transtable['#'] = 11;
-          transtable['['] = 13;
-          transtable['='] = 14;
-          transtable[']'] = 15;
-          transtable['$'] = 82;
-          transtable['^'] = 76;
-          transtable['*'] = 80;
-          transtable['|'] = 79;
-          transtable['\\'] = 81;
-          transtable['&'] = 75;
-
-          int x = 0;
-          int y = 0;
-          for(std::vector<int>::iterator i = ia_tm.begin(); i != ia_tm.end(); ++i)
-            {
-              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
-                {
-                  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;
-                }
+      { // Read Camera
+        lisp_object_t* cur = 0;
+        if (reader.read_lisp("camera", &cur))
+          {
+            LispReader reader(cur);
+            if(world) {
+              world->camera->read(reader);
             }
-        }
-    }
-
-  bg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
-  ia_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
-  fg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
-
-  for(int i = 0; i < height; ++i)
-    {
-      ia_tiles[i].resize(width + 1, 0);
-      bg_tiles[i].resize(width + 1, 0);
-      fg_tiles[i].resize(width + 1, 0);
-    }
-
-  int i = 0;
-  int j = 0;
-  for(vector<int>::iterator it = ia_tm.begin(); it != ia_tm.end(); ++it, ++i)
-    {
-      ia_tiles[j][i] = (*it);
-      if(i == width - 1)
-        {
-          i = -1;
-          ++j;
-        }
-    }
-
-  i = j = 0;
-  for(vector<int>::iterator it = bg_tm.begin(); it != bg_tm.end(); ++it, ++i)
-    {
-
-      bg_tiles[j][i] = (*it);
-      if(i == width - 1)
-        {
-          i = -1;
-          ++j;
-        }
-    }
-
-  i = j = 0;
-  for(vector<int>::iterator it = fg_tm.begin(); it != fg_tm.end(); ++it, ++i)
-    {
-
-      fg_tiles[j][i] = (*it);
-      if(i == width - 1)
-        {
-          i = -1;
-          ++j;
-        }
+          }
+      }
     }
 
   lisp_free(root_obj);
@@ -552,147 +391,82 @@ Level::load(const std::string& filename)
 /* Save data for level: */
 
 void 
-Level::save(const std::string& subset, int level)
+Level::save(const std::string& subset, int level, World* world)
 {
   char filename[1024];
   char str[80];
 
   /* Save data file: */
-  sprintf(str, "/levels/%s/", subset.c_str());
+  snprintf(str, sizeof(str), "/levels/%s/", subset.c_str());
   fcreatedir(str);
-  snprintf(filename, 1024, "%s/levels/%s/level%d.stl", st_dir, subset.c_str(),
-      level);
+  snprintf(filename, sizeof(filename),
+      "%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.c_str(), level);
-
-  FILE * fi = fopen(filename, "w");
-  if (fi == NULL)
-    {
-      perror(filename);
-      st_shutdown();
-      exit(-1);
-    }
+    snprintf(filename, sizeof(filename), "%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 made using the built-in leveleditor\n");
-  fprintf(fi,"(supertux-level\n");
-
-  fprintf(fi,"  (version %d)\n", 1);
-  fprintf(fi,"  (name \"%s\")\n", name.c_str());
-  fprintf(fi,"  (author \"%s\")\n", author.c_str());
-  fprintf(fi,"  (music \"%s\")\n", song_title.c_str());
-  fprintf(fi,"  (background \"%s\")\n", bkgd_image.c_str());
-  fprintf(fi,"  (particle_system \"%s\")\n", particle_system.c_str());
-  fprintf(fi,"  (bkgd_speed %d)\n", bkgd_speed);
-  fprintf(fi,"  (bkgd_red_top %d)\n", bkgd_top.red);
-  fprintf(fi,"  (bkgd_green_top %d)\n", bkgd_top.green);
-  fprintf(fi,"  (bkgd_blue_top %d)\n", bkgd_top.blue);
-  fprintf(fi,"  (bkgd_red_bottom %d)\n", bkgd_bottom.red);
-  fprintf(fi,"  (bkgd_green_bottom %d)\n", bkgd_bottom.green);
-  fprintf(fi,"  (bkgd_blue_bottom %d)\n", bkgd_bottom.blue);
-  fprintf(fi,"  (time %d)\n", time_left);
-  fprintf(fi,"  (width %d)\n", width);
-  fprintf(fi,"  (height %d)\n", height);
-  if(back_scrolling)
-    fprintf(fi,"  (back_scrolling #t)\n"); 
-  else
-    fprintf(fi,"  (back_scrolling #f)\n");
-  fprintf(fi,"  (hor_autoscroll_speed %2.1f)\n", hor_autoscroll_speed);
-  fprintf(fi,"  (gravity %2.1f)\n", gravity);
-  fprintf(fi,"  (background-tm ");
-
-  for(int y = 0; y < height; ++y)
-    {
-      for(int i = 0; i < width; ++i)
-        fprintf(fi," %d ", bg_tiles[y][i]);
-      fprintf(fi,"\n");
-    }
-
-  fprintf( fi,")\n");
-  fprintf(fi,"  (interactive-tm ");
-
-  for(int y = 0; y < height; ++y)
-    {
-      for(int i = 0; i < width; ++i)
-        fprintf(fi," %d ", ia_tiles[y][i]);
-      fprintf(fi,"\n");
-    }
-
-  fprintf( fi,")\n");
-  fprintf(fi,"  (foreground-tm ");
-
-  for(int y = 0; y < height; ++y)
-    {
-      for(int i = 0; i < width; ++i)
-        fprintf(fi," %d ", fg_tiles[y][i]);
-      fprintf(fi,"\n");
-    }
-
-  fprintf( fi,")\n");
-
-  fprintf( fi,"(reset-points\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("time", time_left);
+  writer.write_int("width", width);
+  writer.write_int("height", height);
+  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)
-    fprintf( fi,"(point (x %d) (y %d))\n",i->x, i->y);
-  fprintf( fi,")\n");
-
-  fprintf( fi,"(objects\n");
-
-  for(std::vector<BadGuyData>::iterator it = badguy_data.begin();
-      it != badguy_data.end();
-      ++it)
-    fprintf( fi,"  (%s (x %d) (y %d) (stay-on-platform %s))\n",
-             badguykind_to_string((*it).kind).c_str(),(*it).x,(*it).y,
-             it->stay_on_platform ? "#t" : "#f");
-
-  fprintf( fi,")\n");
-
-  fprintf( fi,")\n");
+      i != reset_points.end(); ++i) {
+    writer.start_list("point");
+    writer.write_int("x", i->x);
+    writer.write_int("y", i->y);
+    writer.end_list("point");
+  }
+  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::cleanup()
 {
-  for(int i=0; i < 15; ++i)
-    {
-      bg_tiles[i].clear();
-      ia_tiles[i].clear();
-      fg_tiles[i].clear();
-    }
+  bg_tiles.clear();
+  ia_tiles.clear();
+  fg_tiles.clear();
 
   reset_points.clear();
   name = "";
   author = "";
   song_title = "";
-  bkgd_image = "";
-
-  badguy_data.clear();
-}
-
-void 
-Level::load_gfx()
-{
-  if(!bkgd_image.empty())
-    {
-      char fname[1024];
-      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(), bkgd_image.c_str());
-      delete img_bkgd;
-      img_bkgd = new Surface(fname, IGNORE_ALPHA);
-    }
-  else
-    {
-      delete img_bkgd;
-      img_bkgd = 0;
-    }
 }
 
 /* Load a level-specific graphic... */
@@ -709,32 +483,42 @@ void Level::load_image(Surface** ptexture, string theme,const  char * file, int
 
 /* Change the size of a level */
 void 
-Level::change_width (int new_width)
+Level::resize(int new_width, int new_height)
 {
-  if(new_width < 21)
-    new_width = 21;
-
-  for(int y = 0; y < height; ++y)
-    {
-      ia_tiles[y].resize(new_width, 0);
-      bg_tiles[y].resize(new_width, 0);
-      fg_tiles[y].resize(new_width, 0);
+  if(new_width < width) {
+    // remap tiles for new width
+    for(int y = 0; y < height && y < new_height; ++y) {
+      for(int x = 0; x < new_width; ++x) {
+        ia_tiles[y * new_width + x] = ia_tiles[y * width + x];
+        bg_tiles[y * new_width + x] = bg_tiles[y * width + x];
+        fg_tiles[y * new_width + x] = fg_tiles[y * width + x];
+      }
     }
+  }
 
-  width = new_width;
-}
-
-void 
-Level::change_height (int new_height)
-{
-  if(new_height < 15)
-    new_height = 15;
-
-  bg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
-  ia_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
-  fg_tiles.resize(height+1, std::vector<unsigned int>(width, 0));
+  ia_tiles.resize(new_width * new_height);
+  bg_tiles.resize(new_width * new_height);
+  fg_tiles.resize(new_width * new_height); 
+
+  if(new_width > width) {
+    // remap tiles
+    for(int y = std::min(height, new_height)-1; y >= 0; --y) {
+      for(int x = new_width-1; x >= 0; --x) {
+        if(x >= width) {
+          ia_tiles[y * new_width + x] = 0;
+          bg_tiles[y * new_width + x] = 0;
+          fg_tiles[y * new_width + x] = 0;
+        } else {
+          ia_tiles[y * new_width + x] = ia_tiles[y * width + x];
+          bg_tiles[y * new_width + x] = bg_tiles[y * width + x];
+          fg_tiles[y * new_width + x] = fg_tiles[y * width + x];
+        }
+      }
+    }
+  }
 
   height = new_height;
+  width = new_width;
 }
 
 void
@@ -748,30 +532,18 @@ Level::change(float x, float y, int tm, unsigned int c)
       switch(tm)
         {
         case TM_BG:
-          bg_tiles[yy][xx] = c;
+          bg_tiles[yy * width + xx] = c;
           break;
         case TM_IA:
-          ia_tiles[yy][xx] = c;
+          ia_tiles[yy * width + xx] = c;
           break;
         case TM_FG:
-          fg_tiles[yy][xx] = c;
+          fg_tiles[yy * width + xx] = c;
           break;
         }
     }
 }
 
-void Level::draw_bg()
-{
-  // 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 + (height*32 - screen->h),
-                        x == 0 ? img_bkgd->w - sx : img_bkgd->w, y == 0 ? img_bkgd->h - sy : img_bkgd->h);
-}
-
 void
 Level::load_song()
 {
@@ -817,7 +589,7 @@ Level::gettileid(float x, float y) const
   xx = ((int)x / 32);
 
   if (yy >= 0 && yy < height && xx >= 0 && xx <= width)
-    c = ia_tiles[yy][xx];
+    c = ia_tiles[yy * width + xx];
   else
     c = 0;
 
@@ -827,10 +599,10 @@ Level::gettileid(float x, float y) const
 unsigned int
 Level::get_tile_at(int x, int y) const
 {
-  if(x < 0 || x > width || y < 0 || y > height)
+  if(x < 0 || x >= width || y < 0 || y >= height)
     return 0;
   
-  return ia_tiles[y][x];
+  return ia_tiles[y * width + x];
 }
 
 /* EOF */