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

Made recruitment= formula work in a loop like move= formula

Browse source
This commit is contained in:
Bartek Waresiak 2009-07-05 09:40:58 +00:00
parent a88ddd0a3c
commit 64d1ad97cf
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/ai/formula/ai.cpp
View file

@ -2326,29 +2326,23 @@ bool formula_ai::do_recruitment()
return false;
}
variant var = recruit_formula_->execute(*this);
std::vector<variant> vars;
if(var.is_list()) {
for(size_t n = 0; n != var.num_elements(); ++n) {
vars.push_back(var[n]);
}
} else {
vars.push_back(var);
}
bool ret = false;
for(std::vector<variant>::const_iterator i = vars.begin(); i != vars.end(); ++i) {
if(!i->is_string()) {
return false;
}
if(!recruit(i->as_string())) {
return ret;
game_logic::map_formula_callable callable(this);
callable.add_ref();
try {
while(make_action(recruit_formula_,callable))
{
ret = true;
}
ret = true;
}
catch(formula_error& e) {
if(e.filename == "recruit formula")
e.line = 0;
handle_exception( e, "Formula error");
}
return do_recruitment();
return ret;
}
namespace {