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

Merge pull request #762 from GregoryLundberg/GL_no_map_error_for_UMC_tiles

Browse source 
Errors during Load if the save file has non-standard terrain
This commit is contained in:
Charles Dang 2016-09-01 11:36:34 +11:00 • committed by GitHub
commit 019f9ab757
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/map/map.cpp
View file

@ -198,9 +198,7 @@ void gamemap::read(const std::string& data, const bool allow_invalid, int border
if(!tdata_->try_merge_terrains(tiles_[x][y])) {
std::stringstream ss;
ss << "Illegal tile in map: (" << t_translation::write_terrain_code(tiles_[x][y])
<< ") '" << tiles_[x][y] << "'\n";
ERR_CF << ss.str();
ss << "The map cannot be loaded.";
<< ") '" << tiles_[x][y] << "'";
throw incorrect_map_format_error(ss.str().c_str());
}
}