#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"
Tile::Tile()
: id(0), editor_image(0), attributes(0), data(0), anim_fps(1)
if(reader.get("slope-type", data)) {
attributes |= SOLID | SLOPE;
}
-
+
const lisp::Lisp* images = reader.get_lisp("images");
if(images)
parse_images(*images);
if(cur->get_type() == lisp::Lisp::TYPE_STRING) {
std::string file;
cur->get(file);
- imagespecs.push_back(ImageSpec(file, Rectangle(0, 0, 0, 0)));
+ 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();
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";
continue;
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);
} else {
images.push_back(surface);
}
if(editor_imagefile != "") {
- editor_image = new Surface(
- get_resource_filename(
- std::string("images/tilesets/") + editor_imagefile), true);
+ editor_image = new Surface(tilesetpath + editor_imagefile, true);
}
}
Tile::draw(DrawingContext& context, const Vector& pos, int layer) const
{
if(images.size() > 1) {
- size_t frame = size_t(global_time * anim_fps) % images.size();
+ size_t frame = size_t(game_time * anim_fps) % images.size();
context.draw_surface(images[frame], pos, layer);
} else if (images.size() == 1) {
context.draw_surface(images[0], pos, layer);