- else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0)
- {
- LispReader reader(lisp_cdr(element));
- std::string filename;
- reader.read_string("file", filename);
- filename = datadir + "/images/tilesets/" + filename;
- load_tileset(filename);
- }
- else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0)
- {
- TileGroup new_;
- LispReader reader(lisp_cdr(element));
- reader.read_string("name", new_.name);
- reader.read_int_vector("tiles", new_.tiles);
- tilegroups.insert(new_).first;
- }
- else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
- {
- LispReader reader(lisp_cdr(element));
- reader.read_int("id", tileset_id);
- tileset_id *= 1000;
- }
- else
- {
- std::cerr << "Unknown symbol: " <<
- lisp_symbol(lisp_car(element)) << "\n";
- }
+ } else if(iter.item() == "tilegroup") {
+ TileGroup tilegroup;
+ const lisp::Lisp* tilegroup_lisp = iter.lisp();
+ tilegroup_lisp->get("name", tilegroup.name);
+ tilegroup_lisp->get_vector("tiles", tilegroup.tiles);
+ tilegroups.insert(tilegroup);
+ } else if (iter.item() == "tiles") {
+ // List of ids (use 0 if the tile should be ignored)
+ std::vector<unsigned int> ids;
+ // List of attributes of the tile
+ std::vector<unsigned int> attributes;
+ std::string image;
+
+ // width and height of the image in tile units, this is used for two
+ // purposes:
+ // a) so we don't have to load the image here to know its dimensions
+ // b) so that the resulting 'tiles' entry is more robust,
+ // ie. enlarging the image won't break the tile id mapping
+ // FIXME: height is actually not used, since width might be enough for
+ // all purposes, still feels somewhat more natural this way
+ unsigned int width = 0;
+ unsigned int height = 0;
+
+ iter.lisp()->get_vector("ids", ids);
+ iter.lisp()->get_vector("attributes", attributes);
+ iter.lisp()->get("image", image);
+ iter.lisp()->get("width", width);
+ iter.lisp()->get("height", height);
+
+ if (ids.size() != attributes.size())
+ {
+ std::ostringstream err;
+ err << "Number of ids (" << ids.size() << ") and attributes (" << attributes.size()
+ << ") missmatch for image '" << image << "', but must be equal";
+ throw std::runtime_error(err.str());
+ }