- // 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);
- }
+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, 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;
+ 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";
+ continue;