- {
- lisp_object_t* cur = 0;
- if(reader.read_lisp("objects", cur)) {
- while(!lisp_nil_p(cur)) {
- lisp_object_t* data = lisp_car(cur);
- std::string object_type = lisp_symbol(lisp_car(data));
-
- LispReader reader(lisp_cdr(data));
-
- GameObject* object = parse_object(object_type, reader);
- if(object) {
- add_object(object);
- } else {
- std::cerr << "Unknown object '" << object_type << "' in level.\n";
- }
-
- cur = lisp_cdr(cur);
+ const lisp::Lisp* objects = reader.get_lisp("objects");
+ if(objects) {
+ lisp::ListIterator iter(objects);
+ while(iter.next()) {
+ GameObject* object = parse_object(iter.item(), *(iter.lisp()));
+ if(object) {
+ add_object(object);
+ } else {
+ std::cerr << "Unknown object '" << iter.item() << "' in level.\n";