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

apply multiplication after addition

Browse source
This commit is contained in:
Dominic Bolin 2006-04-10 15:57:30 +00:00
parent 25003354d2
commit d242ab49f6
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/unit_abilities.cpp
View file

@ -965,8 +965,8 @@ effect::effect(const unit_ability_list& list, int def, bool backstab)
}
}
if(use_cum) {
composite_value_ = maximum<int>(cum_set*cum_mul + cum_add,ncum_set*ncum_mul + ncum_add);
if(ncum_set*ncum_mul + ncum_add > cum_set*cum_mul + cum_add) {
composite_value_ = maximum<int>((cum_set + cum_add)*cum_mul,(ncum_set + ncum_add)*ncum_mul);
if((ncum_set + ncum_add)*ncum_mul > (cum_set + cum_add)*cum_mul) {
effect_list_.clear();
if(ncum_set_effect.type != NOT_USED) {
effect_list_.push_back(ncum_set_effect);
@ -983,7 +983,7 @@ effect::effect(const unit_ability_list& list, int def, bool backstab)
}
}
} else if(use_ncum) {
composite_value_ = ncum_set*ncum_mul + ncum_add;
composite_value_ = (ncum_set + ncum_add)*ncum_mul;
effect_list_.clear();
if(ncum_set_effect.type != NOT_USED) {
effect_list_.push_back(ncum_set_effect);