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

rename static function to select_damage_type

Browse source
This commit is contained in:
newfrenchy83 2024-04-12 19:52:58 +02:00 • committed by Charles Dang
parent ec7adf16d3
commit 94e388186c
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/units/abilities.cpp
View file

@ -1169,7 +1169,7 @@ void attack_type::modified_attacks(unsigned & min_attacks,
}
//Functions used for change damage_type list with damage
static std::optional<std::string> damage_type_opt(const unit_ability_list& abil_list, const std::string& type)
static std::optional<std::string> select_damage_type(const unit_ability_list& abil_list, const std::string& type)
{
std::vector<std::string> type_list;
for(auto& i : abil_list) {
@ -1205,8 +1205,8 @@ std::pair<std::string, std::string> attack_type::damage_type() const
return {type(), ""};
}
std::optional<std::string> replacement_type = damage_type_opt(abil_list, "replacement_type");
std::optional<std::string> alternative_type = damage_type_opt(abil_list, "alternative_type");
std::optional<std::string> replacement_type = select_damage_type(abil_list, "replacement_type");
std::optional<std::string> alternative_type = select_damage_type(abil_list, "alternative_type");
std::string type_damage = replacement_type.value_or(type());
if(alternative_type && type_damage != *alternative_type){
return {type_damage, *alternative_type};