X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftile.hpp;h=d7e3d233ff3d979001ef9154857aeb85e1ec8e55;hb=9bc1e444b1961c5399ab9ce06542c4de7c7a0ec5;hp=efeae2eb77a85a82561e6b19e33aeda5197d8afd;hpb=1ebbfa05ccedec74dfe0269da1a154de51268191;p=supertux.git diff --git a/src/tile.hpp b/src/tile.hpp index efeae2eb7..d7e3d233f 100644 --- a/src/tile.hpp +++ b/src/tile.hpp @@ -1,7 +1,8 @@ // $Id$ -// +// // SuperTux // Copyright (C) 2004 Tobias Glaesser +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -12,7 +13,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -98,10 +99,7 @@ private: std::vector imagespecs; std::vector images; - std::string editor_imagefile; - Surface* editor_image; - - /** tile attributes */ + /// tile attributes uint32_t attributes; /** General purpose data attached to a tile (content of a box, type of coin)*/ @@ -113,9 +111,7 @@ public: ~Tile(); /** Draw a tile on the screen */ - void draw(DrawingContext& context, const Vector& pos, int layer) const; - - Surface* get_editor_image() const; + void draw(DrawingContext& context, const Vector& pos, int z_pos) const; unsigned int getID() const { return id; }