X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.cpp;h=ea18d8e56edfdb4a26c5803af2df755f9d966754;hb=b50836ea0d5c455c115fba76616ba544aad5ae5f;hp=2befbbfb2680d68efab35ee22b952e21e04312bc;hpb=5f32bd40b95fb80990538562d7364422d96f8cfe;p=supertux.git diff --git a/src/tile.cpp b/src/tile.cpp index 2befbbfb2..ea18d8e56 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -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 @@ -24,16 +25,24 @@ #include #include -#include "lisp/lisp.h" -#include "tile.h" -#include "resources.h" -#include "timer.h" -#include "math/vector.h" -#include "video/drawing_context.h" +#include "lisp/lisp.hpp" +#include "tile.hpp" +#include "resources.hpp" +#include "timer.hpp" +#include "math/vector.hpp" +#include "video/drawing_context.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), attributes(attributes), data(0), anim_fps(1) { + imagespecs.push_back(imagespec); } Tile::~Tile() @@ -42,7 +51,6 @@ Tile::~Tile() ++i) { delete *i; } - delete editor_image; } void @@ -51,8 +59,8 @@ Tile::parse(const lisp::Lisp& reader) if(!reader.get("id", id)) { throw std::runtime_error("Missing tile-id."); } - - bool value; + + bool value = false; if(reader.get("solid", value) && value) attributes |= SOLID; if(reader.get("unisolid", value) && value) @@ -63,8 +71,10 @@ Tile::parse(const lisp::Lisp& reader) attributes |= ICE; if(reader.get("water", value) && value) attributes |= WATER; - if(reader.get("spike", value) && value) - attributes |= SPIKE; + if(reader.get("hurts", value) && value) + attributes |= HURTS; + if(reader.get("fire", value) && value) + attributes |= FIRE; if(reader.get("fullbox", value) && value) attributes |= FULLBOX; if(reader.get("coin", value) && value) @@ -78,10 +88,10 @@ Tile::parse(const lisp::Lisp& reader) data |= WORLDMAP_SOUTH; if(reader.get("west", value) && value) data |= WORLDMAP_WEST; - if(reader.get("east", value) && value) + if(reader.get("east", value) && value) data |= WORLDMAP_EAST; if(reader.get("stop", value) && value) - data |= WORLDMAP_STOP; + data |= WORLDMAP_STOP; reader.get("data", data); reader.get("anim-fps", anim_fps); @@ -89,15 +99,10 @@ Tile::parse(const lisp::Lisp& reader) if(reader.get("slope-type", data)) { attributes |= SOLID | SLOPE; } - - if (!reader.get("alpha", alpha)) { - alpha = 255; - } const lisp::Lisp* images = reader.get_lisp("images"); if(images) parse_images(*images); - reader.get("editor-images", editor_imagefile); } void @@ -110,12 +115,12 @@ Tile::parse_images(const lisp::Lisp& images_lisp) std::string file; cur->get(file); imagespecs.push_back(ImageSpec(file, Rect(0, 0, 0, 0))); - } else if(cur->get_type() == lisp::Lisp::TYPE_CONS && + } 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(); std::string file; - float x, y, w, h; + float x = 0, y = 0, w = 0, h = 0; ptr->get_car()->get(file); ptr = ptr->get_cdr(); ptr->get_car()->get(x); ptr = ptr->get_cdr(); ptr->get_car()->get(y); ptr = ptr->get_cdr(); @@ -123,10 +128,10 @@ Tile::parse_images(const lisp::Lisp& images_lisp) ptr->get_car()->get(h); imagespecs.push_back(ImageSpec(file, Rect(x, y, x+w, y+h))); } else { - std::cerr << "Expected string or list in images tag.\n"; + log_warning << "Expected string or list in images tag" << std::endl; continue; } - + list = list->get_cdr(); } } @@ -139,48 +144,27 @@ Tile::load_images(const std::string& tilesetpath) imagespecs.end(); ++i) { const ImageSpec& spec = *i; Surface* surface; - std::string file - = get_resource_filename(tilesetpath + spec.file); + std::string file = tilesetpath + spec.file; if(spec.rect.get_width() <= 0) { - surface = new Surface(file, true); + surface = new Surface(file); } else { surface = new Surface(file, (int) spec.rect.p1.x, (int) spec.rect.p1.y, (int) spec.rect.get_width(), - (int) spec.rect.get_height(), true); + (int) spec.rect.get_height()); } images.push_back(surface); } - if(editor_imagefile != "") { - editor_image = new Surface( - get_resource_filename(tilesetpath + editor_imagefile), true); - } -} - -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 { - context.set_alpha(this->alpha); - if(images.size() > 1) { - size_t frame = size_t(global_time * anim_fps) % images.size(); - context.draw_surface(images[frame], pos, layer); + size_t frame = size_t(game_time * anim_fps) % images.size(); + 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); } - - context.set_alpha(255); } -