// $Id$
-//
+//
// SuperTux
// Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// 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
#include "timer.hpp"
#include "math/vector.hpp"
#include "video/drawing_context.hpp"
-#include "msg.hpp"
+#include "log.hpp"
Tile::Tile()
- : id(0), editor_image(0), attributes(0), data(0), anim_fps(1)
+ : id(0), attributes(0), data(0), anim_fps(1)
{
}
-Tile::Tile(unsigned int id_, Uint32 attributes_, const ImageSpec& imagespec)
- : id(id_), editor_image(0), attributes(attributes_), data(0), anim_fps(1)
+Tile::Tile(unsigned int id, Uint32 attributes, const ImageSpec& imagespec)
+ : id(id), attributes(attributes), data(0), anim_fps(1)
{
imagespecs.push_back(imagespec);
}
++i) {
delete *i;
}
- delete editor_image;
}
void
const lisp::Lisp* images = reader.get_lisp("images");
if(images)
parse_images(*images);
- reader.get("editor-images", editor_imagefile);
}
void
ptr->get_car()->get(h);
imagespecs.push_back(ImageSpec(file, Rect(x, y, x+w, y+h)));
} else {
- msg_warning("Expected string or list in images tag");
+ log_warning << "Expected string or list in images tag" << std::endl;
continue;
}
}
images.push_back(surface);
}
- if(editor_imagefile != "") {
- editor_image = new Surface(tilesetpath + editor_imagefile);
- }
-}
-
-Surface*
-Tile::get_editor_image() const
-{
- if(editor_image)
- return editor_image;
- if(images.size() > 0)
- return images[0];
-
- return 0;
}
void
-Tile::draw(DrawingContext& context, const Vector& pos, int layer) const
+Tile::draw(DrawingContext& context, const Vector& pos, int z_pos) const
{
if(images.size() > 1) {
size_t frame = size_t(game_time * anim_fps) % images.size();
- context.draw_surface(images[frame], pos, layer);
+ context.draw_surface(images[frame], pos, z_pos);
} else if (images.size() == 1) {
- context.draw_surface(images[0], pos, layer);
+ context.draw_surface(images[0], pos, z_pos);
}
}