- tiles.clear();
-
- lisp_object_t* root_obj = lisp_read_from_file(filename);
-
- if (!root_obj)
- st_abort("Couldn't load file", filename);
-
- if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-tiles") == 0)
- {
- lisp_object_t* cur = lisp_cdr(root_obj);
- int tileset_id = 0;
-
- while(!lisp_nil_p(cur))
- {
- lisp_object_t* element = lisp_car(cur);
-
- if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0)
- {
- std::vector<std::string> editor_filenames;
-
- Tile* tile = new Tile;
- tile->id = -1;
- tile->solid = false;
- tile->brick = false;
- tile->ice = false;
- tile->water = false;
- tile->fullbox = false;
- tile->distro = false;
- tile->data = 0;
- tile->next_tile = 0;
- tile->anim_speed = 25;
-
- LispReader reader(lisp_cdr(element));
- assert(reader.read_int("id", &tile->id));
- reader.read_bool("solid", &tile->solid);
- reader.read_bool("brick", &tile->brick);
- reader.read_bool("ice", &tile->ice);
- reader.read_bool("water", &tile->water);
- reader.read_bool("fullbox", &tile->fullbox);
- reader.read_bool("distro", &tile->distro);
- reader.read_int("data", &tile->data);
- reader.read_int("anim-speed", &tile->anim_speed);
- reader.read_int("next-tile", &tile->next_tile);
- reader.read_string_vector("images", &tile->filenames);
- reader.read_string_vector("editor-images", &editor_filenames);
-
- for(std::vector<std::string>::iterator it = tile->
- filenames.begin();
- it != tile->filenames.end();
- ++it)
- {
- Surface* cur_image;
- tile->images.push_back(cur_image);
- tile->images[tile->images.size()-1] = new Surface(
- datadir + "images/tilesets/" + (*it),
- USE_ALPHA);
- }
- for(std::vector<std::string>::iterator it = editor_filenames.begin();
- it != editor_filenames.end();
- ++it)
- {
- Surface* cur_image;
- tile->editor_images.push_back(cur_image);
- tile->editor_images[tile->editor_images.size()-1] = new Surface(
- datadir + "images/tilesets/" + (*it),
- USE_ALPHA);
- }
-
- if (tile->id + tileset_id >= int(tiles.size())
- )
- tiles.resize(tile->id + tileset_id+1);
-
- tiles[tile->id + tileset_id] = tile;
- }
- 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_;
- if(!tilegroups_)
- tilegroups_ = new std::vector<TileGroup>;
- tilegroups_->push_back(new_);
- LispReader reader(lisp_cdr(element));
- tilegroups_->back().name;
- reader.read_string("name", &tilegroups_->back().name);
- reader.read_int_vector("tiles", &tilegroups_->back().tiles);
- }
- 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
- {
- puts("Unhandled symbol");
- }
-
- cur = lisp_cdr(cur);
- }
- }
- else
- {
- assert(0);
+
+ bool value;
+ if(reader.read_bool("solid", value) && value)
+ attributes |= SOLID;
+ if(reader.read_bool("unisolid", value) && value)
+ attributes |= GOAL;
+ if(reader.read_bool("brick", value) && value)
+ attributes |= BRICK;
+ if(reader.read_bool("ice", value) && value)
+ attributes |= ICE;
+ if(reader.read_bool("water", value) && value)
+ attributes |= WATER;
+ if(reader.read_bool("spike", value) && value)
+ attributes |= SPIKE;
+ if(reader.read_bool("fullbox", value) && value)
+ attributes |= FULLBOX;
+ if(reader.read_bool("distro", value) && value)
+ attributes |= COIN;
+ if(reader.read_bool("coin", value) && value)
+ attributes |= COIN;
+ if(reader.read_bool("goal", value) && value)
+ attributes |= GOAL;
+
+ reader.read_int("data", data);
+ reader.read_int("anim-speed", anim_speed);
+ reader.read_int("next-tile", next_tile);
+
+ slope_angle = 0;
+ reader.read_float("slope-angle", slope_angle);
+ if(slope_angle != 0)
+ { // convert angle to radians from degrees:
+ slope_angle = (slope_angle * M_PI) / 180;
+ attributes |= SOLID;