0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing an obsolete feature,

Browse source 
that never was used, in the terrain graphics engine.
This commit is contained in:
Philippe Plantier 2004-06-30 18:07:43 +00:00
parent 21cbd56581
commit 2ec64567c0
2 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/builder.cpp
View file

@ -224,20 +224,6 @@ terrain_builder::building_rule terrain_builder::rotate_rule(const terrain_builde
return ret;
}
terrain_builder::building_rule terrain_builder::rule_from_terrain_template(const terrain_builder::building_rule&tpl, const gamemap::TERRAIN terrain)
{
terrain_builder::building_rule ret = tpl;
std::string ter(1, terrain);
constraint_set::iterator cons;
for(cons = ret.constraints.begin(); cons != ret.constraints.end(); ++cons) {
replace_token(cons->second.terrain_types, "@", ter);
}
replace_token(ret, "@T", map_.get_terrain_info(terrain).default_image());
return ret;
}
void terrain_builder::add_images_from_config(imagelist& images, const config &cfg)
{
const config::child_list& cimages = cfg.get_children("image");
@ -444,18 +430,8 @@ void terrain_builder::parse_config(const config &cfg)
// Handles rotations
const std::string rotations = (**br)["rotations"];
const std::string terrains = (**br)["terrains"];
if(terrains.empty()) {
add_rotated_rules(building_rules_, pbr, rotations);
} else {
for(std::string::const_iterator terrain = terrains.begin();
terrain != terrains.end(); ++terrain) {
const building_rule r = rule_from_terrain_template(pbr, *terrain);
add_rotated_rules(building_rules_, r, rotations);
}
}
add_rotated_rules(building_rules_, pbr, rotations);
}

1
src/builder.hpp
View file

@ -123,7 +123,6 @@ private:
typedef std::multimap<int, gamemap::location> anchormap;
void parse_mapstring(const std::string &mapstring, struct building_rule &br,
anchormap& anchors);
terrain_builder::building_rule rule_from_terrain_template(const terrain_builder::building_rule &tpl, const gamemap::TERRAIN terrain);
void parse_config(const config &cfg);
bool terrain_matches(gamemap::TERRAIN letter, const std::string &terrains);
bool rule_matches(const building_rule &rule, const gamemap::location &loc, int rule_index, bool check_loc);