upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-13 17:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix _off^_usr not using the tile_image of theme.

Browse Source
This commit is contained in:
Ali El Gariani 2010-07-08 19:59:59 +00:00
parent 5dde705c6d
commit ec3b37f005
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/builder.cpp
View File

@ -168,6 +168,8 @@ terrain_builder::terrain_builder(const config& level,
image::precache_file_existence("terrain/");
if(building_rules_.empty() && rules_cfg_){
//off_map first to prevent some default rule seems to block it
add_off_map_rule(offmap_image);
// parse global terrain rules
parse_global_config(*rules_cfg_);
} else {
@ -177,7 +179,6 @@ terrain_builder::terrain_builder(const config& level,
// parse local rules
parse_config(level);
add_off_map_rule(offmap_image);
build_terrains();
}
@ -895,7 +896,7 @@ void terrain_builder::add_off_map_rule(const std::string& image)
item["set_flag"] = "base";
// Parse the object
parse_config(cfg);
parse_global_config(cfg);
}
bool terrain_builder::rule_matches(const terrain_builder::building_rule &rule,