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

Move filtering code out of the unit formula manager.

Browse source
This commit is contained in:
Celtic Minstrel 2016-03-29 09:37:57 -04:00
parent 49fc414cc6
commit 7b6dea55c8
3 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/units/filter.cpp
View file

@ -35,6 +35,8 @@
#include "units/types.hpp"
#include "variable.hpp" // needed for vconfig, scoped unit
#include "wml_exception.hpp" // needed for FAIL
#include "formula/callable_objects.hpp"
#include "formula/formula.hpp"
#include <boost/foreach.hpp>
#include <boost/optional.hpp>
@ -551,7 +553,16 @@ bool basic_unit_filter_impl::internal_matches_filter(const unit & u, const map_l
}
}
if (!vcfg["formula"].blank()) {
if (!u.formula_manager().matches_filter(vcfg["formula"], loc, u)) {
try {
const unit_callable callable(loc,u);
const game_logic::formula form(vcfg["formula"]);
if(!form.evaluate(callable).as_bool()) {
return false;
}
return true;
} catch(game_logic::formula_error& e) {
lg::wml_error() << "Formula error in unit filter: " << e.type << " at " << e.filename << ':' << e.line << ")\n";
// Formulae with syntax errors match nothing
return false;
}
}

16
src/units/formula_manager.cpp
View file

@ -23,22 +23,6 @@
#include <boost/foreach.hpp>
bool unit_formula_manager::matches_filter(const std::string & cfg_formula, const map_location & loc, const unit & me)
{
try {
const unit_callable callable(loc,me);
const game_logic::formula form(cfg_formula);
if(!form.evaluate(callable).as_bool()) {///@todo use formula_ai
return false;
}
return true;
} catch(game_logic::formula_error& e) {
lg::wml_error() << "Formula error in unit filter: " << e.type << " at " << e.filename << ':' << e.line << ")\n";
// Formulae with syntax errors match nothing
return false;
}
}
void unit_formula_manager::add_formula_var(std::string str, variant var)
{
if(!formula_vars_) formula_vars_ = new game_logic::map_formula_callable;

2
src/units/formula_manager.hpp
View file

@ -43,8 +43,6 @@ public:
const std::string& get_loop_formula() const { return unit_loop_formula_; }
const std::string& get_priority_formula() const { return unit_priority_formula_; }
bool matches_filter( const std::string & cfg_formula, const map_location & loc, const unit & me);
void read(const config & ai);
void write(config & cfg);