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

improve 2011-08-11T19:51:43Z!thonsew@yahoo.com by adding a workaround...

Browse source 
...to deal with :unit advances=2 , as well. Also, add a :unit fail=now
command as a testcase for iterator stability guarantee, violation of
which is the real cause behind bug #18488
This commit is contained in:
Iurii Chernyi 2011-08-11 20:49:51 +00:00
parent bd354685df
commit c1e5d4bb55
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/menu_events.cpp
View file

@ -3480,7 +3480,8 @@ void console_handler::do_unit() {
// prevent SIGSEGV due to attempt to set HP during a fight
if (events::commands_disabled > 0)
return;
unit_map::iterator i = menu_handler_.current_unit();
unit_map::iterator i = menu_handler_.current_unit();
const map_location loc = i->get_location();
if (i == menu_handler_.units_.end()) return;
const std::string data = get_data(1);
std::vector<std::string> parameters = utils::split(data, '=', utils::STRIP_SPACES);
@ -3508,19 +3509,24 @@ void console_handler::do_unit() {
int int_value = lexical_cast<int>(value);
for (int levels=0; levels<int_value; levels++) {
i->set_experience(i->max_experience());
dialogs::advance_unit(i->get_location());
dialogs::advance_unit(loc);
i = menu_handler_.units_.find(loc);
if (!i.valid()) {
break;
}
}
} else {
config cfg;
i->write(cfg);
const map_location loc = i->get_location();
menu_handler_.units_.erase(loc);
cfg[name] = value;
unit new_u(cfg, true);
std::pair<unit_map::unit_iterator, bool> new_i=menu_handler_.units_.add(loc, new_u);
i=new_i.first;
menu_handler_.units_.add(loc, new_u);
}
menu_handler_.gui_->invalidate(i->get_location());
if (name == "fail") { //testcase for bug #18488
assert(i.valid());
}
menu_handler_.gui_->invalidate(loc);
menu_handler_.gui_->invalidate_unit();
}
/*void console_handler::do_buff() {