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

Don't pass border_size and usage to gamemap::read

Browse source 
This also fixes an issue in [terrain_mask] where masks would be incorrectly
offset due to a default border_size of 0
This commit is contained in:
Charles Dang 2015-08-12 15:42:55 +11:00
parent 5cf8cf2b32
commit 6b78073b49
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game_events/action_wml.cpp
View file

@ -980,7 +980,7 @@ WML_HANDLER_FUNCTION(replace_map, /*event_info*/, cfg)
try {
if (cfg["map"].empty()) {
const vconfig& map_cfg = cfg.child("map");
map.read(map_cfg["data"], false, map_cfg["border_size"].to_int(), map_cfg["usage"].str());
map.read(map_cfg["data"], false);
}
else map.read(cfg["map"], false);
} catch(incorrect_map_format_error&) {
@ -1558,17 +1558,12 @@ WML_HANDLER_FUNCTION(terrain_mask, /*event_info*/, cfg)
//config level;
std::string mask = cfg["mask"];
std::string usage = "mask";
int border_size = 0;
if (mask.empty()) {
usage = cfg["usage"].str();
border_size = cfg["border_size"];
mask = cfg["data"].str();
}
try {
mask_map.read(mask, false, border_size, usage);
mask_map.read(mask, false);
} catch(incorrect_map_format_error&) {
ERR_NG << "terrain mask is in the incorrect format, and couldn't be applied" << std::endl;
return;
@ -1576,6 +1571,7 @@ WML_HANDLER_FUNCTION(terrain_mask, /*event_info*/, cfg)
e.show(*resources::screen);
return;
}
bool border = cfg["border"].to_bool();
resources::gameboard->overlay_map(mask_map, cfg.get_parsed_config(), loc, border);
resources::screen->needs_rebuild(true);

2
src/map.cpp
View file

@ -152,7 +152,7 @@ gamemap::gamemap(const tdata_cache& tdata, const config& level):
total_height_ = 0;
}
} else {
read(map_child["data"], true, map_child["border_size"], map_child["usage"]);
read(map_child["data"], true);
}
}