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

fix test of presence of attack/second_attacl in filter_attack function

Browse source
This commit is contained in:
newfrenchy83 2023-04-13 11:27:58 +02:00 • committed by Steve Cotton
parent e0e8af894e
commit b4f93d4748
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/game_events/handlers.cpp
View file

@ -248,17 +248,22 @@ struct filter_attack : public event_filter {
if(unit_a != units.end() && loc.matches_unit(unit_a)) {
const auto u = unit_a->shared_from_this();
auto temp_weapon = event_info.data.optional_child(first_ ? "first" : "second");
const_attack_ptr attack = std::make_shared<const attack_type>(*temp_weapon);
if(unit_d != units.end() && loc_d.matches_unit(unit_d)) {
const auto opp = unit_d->shared_from_this();
auto temp_other_weapon = event_info.data.optional_child(!first_ ? "first" : "second");
const_attack_ptr second_attack = std::make_shared<const attack_type>(*temp_other_weapon);
auto ctx = attack->specials_context(u, opp, loc, loc_d, first_, second_attack);
auto opp_ctx = second_attack->specials_context(opp, u, loc_d, loc, !first_, attack);
return swf_.empty() || attack->matches_filter(swf_.get_parsed_config());
} else {
auto ctx = attack->specials_context(u, loc, first_);
return swf_.empty() || attack->matches_filter(swf_.get_parsed_config());
if(temp_weapon){
const_attack_ptr attack = std::make_shared<const attack_type>(*temp_weapon);
if(unit_d != units.end() && loc_d.matches_unit(unit_d)) {
const auto opp = unit_d->shared_from_this();
auto temp_other_weapon = event_info.data.optional_child(!first_ ? "first" : "second");
const_attack_ptr second_attack = temp_other_weapon ? std::make_shared<const attack_type>(*temp_other_weapon) : nullptr;
auto ctx = attack->specials_context(u, opp, loc, loc_d, first_, second_attack);
std::optional<decltype(ctx)> opp_ctx;
if(second_attack){
opp_ctx.emplace(second_attack->specials_context(opp, u, loc_d, loc, !first_, attack));
}
return swf_.empty() || attack->matches_filter(swf_.get_parsed_config());
} else {
auto ctx = attack->specials_context(u, loc, first_);
return swf_.empty() || attack->matches_filter(swf_.get_parsed_config());
}
}
}
return false;