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

Avoided costly roundtrip through strings.

Browse source
This commit is contained in:
Guillaume Melquiond 2010-06-03 07:08:15 +00:00
parent 96457801e6
commit fea0fca514
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/actions.cpp
View file

@ -273,7 +273,7 @@ void unit_creator::add_unit(const config &cfg)
}
} else {
assert( resources::units->find(loc) == resources::units->end() );
bool animate = utils::string_bool(temp_cfg["animate"],false);
bool animate = temp_cfg["animate"].to_bool();
temp_cfg.remove_attribute("animate");
if (recall_list_element==team_.recall_list().end()) {
//new unit
@ -1221,7 +1221,7 @@ bool attack::perform_hit(bool attacker_turn, statistics::attack_context &stats)
int damage = 0;
if (hits) {
damage = attacker.damage_;
resources::state_of_game->set_variable("damage_inflicted", str_cast<int>(damage));
resources::state_of_game->get_variable("damage_inflicted") = damage;
}
// Make sure that if we're serializing a game here,
@ -1331,7 +1331,7 @@ bool attack::perform_hit(bool attacker_turn, statistics::attack_context &stats)
}
else
{
bool results_dies = (*ran_results)["dies"] == "yes";
bool results_dies = (*ran_results)["dies"].to_bool();
if (results_dies != dies)
{
errbuf_ << "SYNC: In attack " << a_.dump() << " vs " << d_.dump()