- lisp_object_t* root_obj = lisp_read_from_file(filename);
- if (!root_obj)
- {
- std::cout << "SpriteManager: Couldn't load: " << filename << std::endl;
- return;
- }
-
- lisp_object_t* cur = root_obj;
-
- if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-resources") != 0)
- return;
- cur = lisp_cdr(cur);
-
- while(cur) {
- lisp_object_t* el = lisp_car(cur);
-
- if (strcmp(lisp_symbol(lisp_car(el)), "sprite") == 0) {
- SpriteData* spritedata = new SpriteData(lisp_cdr(el));
-
- Sprites::iterator i = sprites.find(spritedata->get_name());
- if (i == sprites.end()) {
- sprites[spritedata->get_name()] = spritedata;
+ lisp::Parser parser;
+ try {
+ std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+
+ const lisp::Lisp* resources = root->get_lisp("supertux-resources");
+ if(!resources)
+ throw std::runtime_error("file is not a supertux-resources files");
+
+ lisp::ListIterator iter(resources);
+ while(iter.next()) {
+ if(iter.item() == "sprite") {
+ SpriteData* spritedata = new SpriteData(iter.lisp());
+
+ Sprites::iterator i = sprites.find(spritedata->get_name());
+ if (i == sprites.end()) {
+ sprites[spritedata->get_name()] = spritedata;
+ } else {
+ delete i->second;
+ i->second = spritedata;
+ std::cout << "Warning: dulpicate entry: '" << spritedata->get_name()
+ << "' in spritefile." << std::endl;
+ }