forgot an assert

[supertux.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index 20835fb..0fba4df 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -89,7 +89,7 @@ Tile::parse(const lisp::Lisp& reader)
   if(reader.get("slope-type", data)) {
     attributes |= SOLID | SLOPE;
   }
-
+  
   const lisp::Lisp* images = reader.get_lisp("images");
   if(images)
     parse_images(*images);
@@ -105,7 +105,7 @@ Tile::parse_images(const lisp::Lisp& images_lisp)
     if(cur->get_type() == lisp::Lisp::TYPE_STRING) {
       std::string file;
       cur->get(file);
-      imagespecs.push_back(ImageSpec(file, Rectangle(0, 0, 0, 0)));
+      imagespecs.push_back(ImageSpec(file, Rect(0, 0, 0, 0)));
     } else if(cur->get_type() == lisp::Lisp::TYPE_CONS && 
         cur->get_car()->get_type() == lisp::Lisp::TYPE_SYMBOL) {
       const lisp::Lisp* ptr = cur->get_cdr();
@@ -117,7 +117,7 @@ Tile::parse_images(const lisp::Lisp& images_lisp)
       ptr->get_car()->get(y); ptr = ptr->get_cdr();
       ptr->get_car()->get(w); ptr = ptr->get_cdr();
       ptr->get_car()->get(h);
-      imagespecs.push_back(ImageSpec(file, Rectangle(x, y, x+w, y+h)));
+      imagespecs.push_back(ImageSpec(file, Rect(x, y, x+w, y+h)));
     } else {
       std::cerr << "Expected string or list in images tag.\n";
       continue;
@@ -135,8 +135,7 @@ Tile::load_images(const std::string& tilesetpath)
       imagespecs.end(); ++i) {
     const ImageSpec& spec = *i;
     Surface* surface;
-    std::string file 
-      = get_resource_filename(tilesetpath + spec.file);
+    std::string file = tilesetpath + spec.file;
     if(spec.rect.get_width() <= 0) {
       surface = new Surface(file, true);
     } else {
@@ -149,9 +148,7 @@ Tile::load_images(const std::string& tilesetpath)
     images.push_back(surface);
   }
   if(editor_imagefile != "") {
-    editor_image = new Surface(
-        get_resource_filename(
-          std::string("images/tilesets/") + editor_imagefile), true);
+    editor_image = new Surface(tilesetpath + editor_imagefile, true);
   }
 }