X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.cpp;h=ac98f0df4e8be7a1118a1a37091d012d59f85587;hb=1735ae9ea3b0d48f39f84fcefad5ec74275d4943;hp=5668fa6d6a2e04baa8ba28588f2303d1ba2477ee;hpb=2d97548e5cded4b201bbc10d6cec6232df03e9a4;p=supertux.git diff --git a/src/tile.cpp b/src/tile.cpp index 5668fa6d6..ac98f0df4 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,29 +13,37 @@ // 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 // 02111-1307, USA. #include -#include -#include +#include +#include #include #include -#include "app/globals.h" -#include "tile.h" -#include "scene.h" -#include "resources.h" -#include "utils/lispreader.h" -#include "math/vector.h" -#include "video/drawing_context.h" +#include "lisp/lisp.hpp" +#include "tile.hpp" +#include "tile_set.hpp" +#include "resources.hpp" +#include "timer.hpp" +#include "math/vector.hpp" +#include "video/drawing_context.hpp" +#include "log.hpp" + + +Tile::Tile(const TileSet *new_tileset) + : tileset(new_tileset), attributes(0), data(0), anim_fps(1) +{ +} -Tile::Tile() - : id(0), editor_image(0), attributes(0), data(0), anim_fps(1) +Tile::Tile(const TileSet *new_tileset, Uint32 attributes, const ImageSpec& imagespec) + : tileset(new_tileset), attributes(attributes), data(0), anim_fps(1) { + imagespecs.push_back(imagespec); } Tile::~Tile() @@ -43,127 +52,126 @@ Tile::~Tile() ++i) { delete *i; } - delete editor_image; } -void -Tile::parse(LispReader& reader) +uint32_t +Tile::parse(const lisp::Lisp& reader) { - if(!reader.read_uint("id", id)) { + uint32_t id; + if(!reader.get("id", id)) { throw std::runtime_error("Missing tile-id."); } - - bool value; - if(reader.read_bool("solid", value) && value) + + bool value = false; + if(reader.get("solid", value) && value) attributes |= SOLID; - if(reader.read_bool("unisolid", value) && value) + if(reader.get("unisolid", value) && value) attributes |= UNISOLID | SOLID; - if(reader.read_bool("brick", value) && value) + if(reader.get("brick", value) && value) attributes |= BRICK; - if(reader.read_bool("ice", value) && value) + if(reader.get("ice", value) && value) attributes |= ICE; - if(reader.read_bool("water", value) && value) + if(reader.get("water", value) && value) attributes |= WATER; - if(reader.read_bool("spike", value) && value) - attributes |= SPIKE; - if(reader.read_bool("fullbox", value) && value) + 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.read_bool("distro", value) && value) + if(reader.get("coin", value) && value) attributes |= COIN; - if(reader.read_bool("coin", value) && value) - attributes |= COIN; - if(reader.read_bool("goal", value) && value) + if(reader.get("goal", value) && value) attributes |= GOAL; - reader.read_int("data", data); - reader.read_float("anim-fps", anim_fps); + if(reader.get("north", value) && value) + data |= WORLDMAP_NORTH; + if(reader.get("south", value) && value) + data |= WORLDMAP_SOUTH; + if(reader.get("west", value) && value) + data |= WORLDMAP_WEST; + if(reader.get("east", value) && value) + data |= WORLDMAP_EAST; + if(reader.get("stop", value) && value) + data |= WORLDMAP_STOP; + + reader.get("data", data); + reader.get("anim-fps", anim_fps); - if(reader.read_int("slope-type", data)) { + if(reader.get("slope-type", data)) { attributes |= SOLID | SLOPE; } - parse_images(reader.read_lisp("images")); - reader.read_string("editor-images", editor_imagefile); + const lisp::Lisp* images = reader.get_lisp("images"); + if(images) + parse_images(*images); + + return id; } void -Tile::parse_images(lisp_object_t* list) +Tile::parse_images(const lisp::Lisp& images_lisp) { - while(!lisp_nil_p(list)) { - lisp_object_t* cur = lisp_car(list); - if(lisp_string_p(cur)) { - imagespecs.push_back(ImageSpec(lisp_string(cur), Rectangle(0, 0, 0, 0))); - } else if(lisp_cons_p(cur) && lisp_symbol_p(lisp_car(cur))) { - lisp_object_t* sym = lisp_car(cur); - lisp_object_t* data = lisp_cdr(cur); - - if (strcmp(lisp_symbol(sym), "region") == 0) { - float x = lisp_integer(lisp_list_nth(data, 1)); - float y = lisp_integer(lisp_list_nth(data, 2)); - float width = lisp_integer(lisp_list_nth(data, 3)); - float height = lisp_integer(lisp_list_nth(data, 4)); - imagespecs.push_back(ImageSpec(lisp_string(lisp_car(data)), - Rectangle(x, y, x+width, y+height))); - } else { - std::cerr << "Tile: Type mismatch, should be '(region \"somestring\" x y w h)'" << std::endl; - continue; - } + const lisp::Lisp* list = &images_lisp; + while(list) { + const lisp::Lisp* cur = list->get_car(); + if(cur->get_type() == lisp::Lisp::TYPE_STRING) { + 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 && + cur->get_car()->get_type() == lisp::Lisp::TYPE_SYMBOL && + cur->get_car()->get_symbol() == "region") { + const lisp::Lisp* ptr = cur->get_cdr(); + + std::string file; + 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(); + ptr->get_car()->get(w); ptr = ptr->get_cdr(); + 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 = lisp_cdr(list); + + list = list->get_cdr(); } } void Tile::load_images() { + const std::string& tiles_path = tileset->tiles_path; + assert(images.size() == 0); for(std::vector::iterator i = imagespecs.begin(); i != imagespecs.end(); ++i) { const ImageSpec& spec = *i; Surface* surface; - std::string file - = get_resource_filename(std::string("images/tilesets/") + spec.file); + std::string file = tiles_path + 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( - std::string("images/tilesets/") + 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 { 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); } } -