- reader.read_int("data", data);
- reader.read_int("anim-speed", anim_speed);
- reader.read_int("next-tile", next_tile);
-
- std::vector<std::string> filenames;
- reader.read_string_vector("images", filenames);
- std::vector<std::string> editor_filenames;
- reader.read_string_vector("editor-images", editor_filenames);
-
- std::vector<int> grid;
- reader.read_int_vector("grid", grid);
-
- // read images
- for(std::vector<std::string>::iterator i = filenames.begin();
- i != filenames.end(); ++i)
- {
- if (grid.size() == 4)
- {
- Surface* surface = new Surface(datadir + "/images/tilesets/" + *i,
- grid[0], grid[1], grid[2], grid[3],
- USE_ALPHA);
- images.push_back(surface);
- }
- else
- {
- Surface* surface = new Surface(datadir + "/images/tilesets/" + *i, USE_ALPHA);
- images.push_back(surface);
- }
+ 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.get("slope-type", data)) {
+ attributes |= SOLID | SLOPE;
+ }
+
+ const lisp::Lisp* images = reader.get_lisp("images");
+ if(images)
+ parse_images(*images);
+ reader.get("editor-images", editor_imagefile);
+}
+
+void
+Tile::parse_images(const lisp::Lisp& images_lisp)
+{
+ 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, Rectangle(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;
+ 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)));
+ } else {
+ std::cerr << "Expected string or list in images tag.\n";
+ continue;