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

When checking [variable] comparison attributes, return after checking the first one.

Browse source 
The current implementation technically allows for there to be multiple comparison attributes present and it will return false if any of them are false or return true if all of them are true. This changes the implementation to only check the first comparison attribute found and return true or false based on that check, which is how the [variable] tag is documented as working on the wiki.
This commit is contained in:
Pentarctagon 2021-04-09 23:15:22 -05:00 • committed by Pentarctagon
parent fabaa5a28e
commit cd26e800fa
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game_events/conditional_wml.cpp
View file

@ -101,7 +101,7 @@ namespace builtin_conditions {
if (values.has_attribute(name)) { \
std::string attr_str = values[name].str(); \
std::string str_value = value.str(); \
if (!(test)) return false; \
return (test); \
} \
} while (0)
@ -110,7 +110,7 @@ namespace builtin_conditions {
if (values.has_attribute(name)) { \
double attr_num = values[name].to_double(); \
double num_value = value.to_double(); \
if (!(test)) return false; \
return (test); \
} \
} while (0)
@ -119,7 +119,7 @@ namespace builtin_conditions {
if (values.has_attribute(name)) { \
bool attr_bool = values[name].to_bool(); \
bool bool_value = value.to_bool(); \
if (!(test)) return false; \
return (test); \
} \
} while (0)
@ -139,7 +139,7 @@ namespace builtin_conditions {
#undef TEST_NUM_ATTR
#undef TEST_BOL_ATTR
lg::wml_error() << "[variable] found with no comparison attribute\n";
lg::wml_error() << "[variable] name='" << name << "' found with no comparison attribute\n";
return true;
}
}