upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 00:48:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

stopped reporting deprecated terrain format when no terrain used in filter

Browse Source
This commit is contained in:
John W. C. McNabb 2007-01-31 00:28:03 +00:00
parent b4718d9964
commit 073941d7eb
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/map.cpp
View File

@ -593,9 +593,8 @@ bool gamemap::terrain_matches_filter(const gamemap::location& loc, const config&
}
*/
#ifdef TERRAIN_TRANSLATION_COMPATIBLE
if(terrain_format == 0 || terrain_format == -1) {
if(terrain_format == 0 || terrain_format == -1 && !cfg["terrain"].empty()) {
std::cerr << "Warning deprecated terrain format in filter_location \n";
const std::string& terrain = cfg["terrain"];
// Any of these may be a CSV
std::string terrain_letter;