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

Fix SLF when x XOR y is specified (bug #21488)

Browse source 
f979609ccf assumed that x and y always occur together
This commit is contained in:
Alexander van Gessel 2014-01-19 01:19:32 +01:00
parent 7a1e639ca2
commit ec66b700e0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/terrain_filter.cpp
View file

@ -384,7 +384,7 @@ void terrain_filter::get_locations(std::set<map_location>& locs, bool with_borde
std::set<map_location> match_set;
// None of the generators provided
if ( !(cfg_.has_attribute("x") && cfg_.has_attribute("y"))
if ( !cfg_.has_attribute("x") && !cfg_.has_attribute("y")
&& !cfg_.has_attribute("find_in")
&& !cfg_.has_attribute("area") ) {
@ -400,7 +400,7 @@ void terrain_filter::get_locations(std::set<map_location>& locs, bool with_borde
} else
// Only the x,y attributes found
if ( (cfg_.has_attribute("x") && cfg_.has_attribute("y"))
if ( (cfg_.has_attribute("x") || cfg_.has_attribute("y"))
&& !cfg_.has_attribute("find_in")
&& !cfg_.has_attribute("area") ) {
@ -410,7 +410,7 @@ void terrain_filter::get_locations(std::set<map_location>& locs, bool with_borde
} else
// Only find_in provided
if ( !(cfg_.has_attribute("x") && cfg_.has_attribute("y"))
if ( !cfg_.has_attribute("x") && !cfg_.has_attribute("y")
&& cfg_.has_attribute("find_in")
&& !cfg_.has_attribute("area") ) {
@ -430,7 +430,7 @@ void terrain_filter::get_locations(std::set<map_location>& locs, bool with_borde
} else
// Only area provided
if ( !(cfg_.has_attribute("x") && cfg_.has_attribute("y"))
if ( !cfg_.has_attribute("x") && !cfg_.has_attribute("y")
&& !cfg_.has_attribute("find_in")
&& cfg_.has_attribute("area") ) {
@ -439,7 +439,7 @@ void terrain_filter::get_locations(std::set<map_location>& locs, bool with_borde
} else
// find_in + xy
if ( (cfg_.has_attribute("x") && cfg_.has_attribute("y"))
if ( (cfg_.has_attribute("x") || cfg_.has_attribute("y"))
&& cfg_.has_attribute("find_in")
&& !cfg_.has_attribute("area") ) {
@ -472,7 +472,7 @@ void terrain_filter::get_locations(std::set<map_location>& locs, bool with_borde
} else
// xy + area
if ( (cfg_.has_attribute("x") && cfg_.has_attribute("y"))
if ( (cfg_.has_attribute("x") || cfg_.has_attribute("y"))
&& !cfg_.has_attribute("find_in")
&& cfg_.has_attribute("area") ) {