// $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 <iostream>
#include <stdexcept>
-#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()
{
for(std::vector<Surface*>::iterator i = images.begin(); i != images.end();
++i) {
delete *i;
}
- delete editor_image;
}
void
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)
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)
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);
const lisp::Lisp* images = reader.get_lisp("images");
if(images)
parse_images(*images);
- reader.get("editor-images", editor_imagefile);
}
void
if(cur->get_type() == lisp::Lisp::TYPE_STRING) {
std::string file;
cur->get(file);
- imagespecs.push_back(ImageSpec(file, Rectangle(0, 0, 0, 0)));
- } else if(cur->get_type() == lisp::Lisp::TYPE_CONS &&
+ 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) {
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();
ptr->get_car()->get(w); ptr = ptr->get_cdr();
ptr->get_car()->get(h);
- imagespecs.push_back(ImageSpec(file, Rectangle(x, y, x+w, y+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();
}
}
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(
- 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);
}
}
-