I should actually test my changes before committing

[supertux.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index a57d304..bdf92ff 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -24,11 +24,10 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "app/globals.h"
 #include "lisp/lisp.h"
 #include "tile.h"
-#include "scene.h"
 #include "resources.h"
+#include "timer.h"
 #include "math/vector.h"
 #include "video/drawing_context.h"
 
@@ -68,8 +67,6 @@ Tile::parse(const lisp::Lisp& reader)
     attributes |= SPIKE;
   if(reader.get("fullbox", value) && value)
     attributes |= FULLBOX;
-  if(reader.get("distro", value) && value)
-    attributes |= COIN;
   if(reader.get("coin", value) && value)
     attributes |= COIN;
   if(reader.get("goal", value) && value)
@@ -108,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();
@@ -120,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;
@@ -153,8 +150,7 @@ Tile::load_images(const std::string& tilesetpath)
   }
   if(editor_imagefile != "") {
     editor_image = new Surface(
-        get_resource_filename(
-          std::string("images/tilesets/") + editor_imagefile), true);
+        get_resource_filename(tilesetpath + editor_imagefile), true);
   }
 }