X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.h;h=8a0cf8d0bd8bef110f18d78f402d304863c04323;hb=36266bca23c8ef1a4b036572b7c5fa07df7a1afd;hp=a5f5856fc19943c3d943f326794e8f95d737829a;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git diff --git a/src/tile.h b/src/tile.h index a5f5856fc..8a0cf8d0b 100644 --- a/src/tile.h +++ b/src/tile.h @@ -22,11 +22,9 @@ #include #include "video/surface.h" -#include "math/rectangle.h" +#include "math/rect.h" #include "lisp/lisp.h" -using namespace SuperTux; - /** Tile Class */ @@ -74,12 +72,12 @@ private: unsigned int id; struct ImageSpec { - ImageSpec(const std::string& newfile, const Rectangle& newrect) + ImageSpec(const std::string& newfile, const Rect& newrect) : file(newfile), rect(newrect) { } std::string file; - Rectangle rect; + Rect rect; }; std::vector imagespecs; std::vector images; @@ -92,7 +90,7 @@ private: /** General purpose data attached to a tile (content of a box, type of coin)*/ int data; - + float anim_fps; public: