X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.cpp;h=7fef75255a5e1f6258786a639be261ebaec0ab9d;hb=51bbae5942895f6efdd36a7ff3ae28ce897fb3c0;hp=0edef84d9b7a822cd21fa05c76516b35b380f8f6;hpb=9599042661b468aae7bd34dca05441c0ebc93ad7;p=supertux.git diff --git a/src/tile.cpp b/src/tile.cpp index 0edef84d9..7fef75255 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -24,7 +24,6 @@ #include #include -#include "app/globals.h" #include "lisp/lisp.h" #include "tile.h" #include "resources.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;