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

Removed redundant attribute lookup.

Browse source
This commit is contained in:
Guillaume Melquiond 2010-06-12 18:59:00 +00:00
parent c8271f6986
commit d7f80e52a5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/unit_abilities.cpp
View file

@ -818,8 +818,8 @@ effect::effect(const unit_ability_list& list, int def, bool backstab) :
if (!filter_base_matches(cfg, def)) if (!filter_base_matches(cfg, def))
continue; continue;
if (cfg.has_attribute("value")) { if (const config::attribute_value *v = cfg.get("value")) {
int value = cfg["value"]; int value = *v;
bool cumulative = cfg["cumulative"].to_bool(); bool cumulative = cfg["cumulative"].to_bool();
if (!value_is_set && !cumulative) { if (!value_is_set && !cumulative) {
value_set = value; value_set = value;
@ -834,15 +834,15 @@ effect::effect(const unit_ability_list& list, int def, bool backstab) :
value_is_set = true; value_is_set = true;
} }
if (cfg.has_attribute("add")) { if (const config::attribute_value *v = cfg.get("add")) {
int add = cfg["add"]; int add = *v;
std::map<std::string,individual_effect>::iterator add_effect = values_add.find(effect_id); std::map<std::string,individual_effect>::iterator add_effect = values_add.find(effect_id);
if(add_effect == values_add.end() || add > add_effect->second.value) { if(add_effect == values_add.end() || add > add_effect->second.value) {
values_add[effect_id].set(ADD,add,i->first,i->second); values_add[effect_id].set(ADD,add,i->first,i->second);
} }
} }
if (cfg.has_attribute("multiply")) { if (const config::attribute_value *v = cfg.get("multiply")) {
int multiply = int(cfg["multiply"].to_double() * 100); int multiply = int(v->to_double() * 100);
std::map<std::string,individual_effect>::iterator mul_effect = values_mul.find(effect_id); std::map<std::string,individual_effect>::iterator mul_effect = values_mul.find(effect_id);
if(mul_effect == values_mul.end() || multiply > mul_effect->second.value) { if(mul_effect == values_mul.end() || multiply > mul_effect->second.value) {
values_mul[effect_id].set(MUL,multiply,i->first,i->second); values_mul[effect_id].set(MUL,multiply,i->first,i->second);