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

Revert use of boost::optional::emplace for attack specials contexts

Browse source
This commit is contained in:
Celtic Minstrel 2018-03-24 11:44:39 -04:00
parent cffdf8a597
commit 667b2b7bd3
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/actions/attack.cpp
View file

@ -126,7 +126,7 @@ battle_context_unit_stats::battle_context_unit_stats(const unit& u,
boost::optional<decltype(ctx)> opp_ctx;
if(opp_weapon) {
opp_ctx.emplace(opp_weapon->specials_context(&opp, &u, opp_loc, u_loc, !attacking, weapon));
opp_ctx = opp_weapon->specials_context(&opp, &u, opp_loc, u_loc, !attacking, weapon);
}
slows = weapon->get_special_bool("slow");
@ -283,7 +283,7 @@ battle_context_unit_stats::battle_context_unit_stats(const unit_type* u_type,
boost::optional<decltype(ctx)> opp_ctx;
if(opp_weapon) {
opp_ctx.emplace(opp_weapon->specials_context(*opp_type, map_location::null_location(), !attacking));
opp_ctx = opp_weapon->specials_context(*opp_type, map_location::null_location(), !attacking);
}
slows = weapon->get_special_bool("slow");
@ -932,18 +932,18 @@ void attack::fire_event(const std::string& n)
if(a_stats_->weapon != nullptr && a_.valid()) {
if(d_stats_->weapon != nullptr && d_.valid()) {
a_ctx.emplace(a_stats_->weapon->specials_context(nullptr, nullptr, a_.loc_, d_.loc_, true, d_stats_->weapon));
a_ctx = a_stats_->weapon->specials_context(nullptr, nullptr, a_.loc_, d_.loc_, true, d_stats_->weapon);
} else {
a_ctx.emplace(a_stats_->weapon->specials_context(nullptr, a_.loc_, true));
a_ctx = a_stats_->weapon->specials_context(nullptr, a_.loc_, true);
}
a_stats_->weapon->write(a_weapon_cfg);
}
if(d_stats_->weapon != nullptr && d_.valid()) {
if(a_stats_->weapon != nullptr && a_.valid()) {
d_ctx.emplace(d_stats_->weapon->specials_context(nullptr, nullptr, d_.loc_, a_.loc_, false, a_stats_->weapon));
d_ctx = d_stats_->weapon->specials_context(nullptr, nullptr, d_.loc_, a_.loc_, false, a_stats_->weapon);
} else {
d_ctx.emplace(d_stats_->weapon->specials_context(nullptr, d_.loc_, false));
d_ctx = d_stats_->weapon->specials_context(nullptr, d_.loc_, false);
}
d_stats_->weapon->write(d_weapon_cfg);
}

10
src/units/abilities.cpp
View file

@ -574,7 +574,7 @@ namespace {
* Returns whether or not @a *this has a special with a tag or id equal to
* @a special. If @a simple_check is set to true, then the check is merely
* for being present. Otherwise (the default), the check is for a special
* active in the current context (see set_specials_context), including
* active in the current context (see specials_context), including
* specials obtained from the opponent's attack.
*/
bool attack_type::get_special_bool(const std::string& special, bool simple_check) const
@ -610,7 +610,7 @@ bool attack_type::get_special_bool(const std::string& special, bool simple_check
/**
* Returns the currently active specials as an ability list, given the current
* context (see set_specials_context).
* context (see specials_context).
*/
unit_ability_list attack_type::get_specials(const std::string& special) const
{
@ -633,7 +633,7 @@ unit_ability_list attack_type::get_specials(const std::string& special) const
* Each std::pair in the vector has first = name and second = description.
*
* This uses either the active or inactive name/description for each special,
* based on the current context (see set_specials_context), provided
* based on the current context (see specials_context), provided
* @a active_list is not nullptr. Otherwise specials are assumed active.
* If the appropriate name is empty, the special is skipped.
*/
@ -670,7 +670,7 @@ std::vector<std::pair<t_string, t_string>> attack_type::special_tooltips(
* Empty names are skipped.
*
* This excludes inactive specials if only_active is true. Whether or not a
* special is active depends on the current context (see set_specials_context)
* special is active depends on the current context (see specials_context)
* and the @a is_backstab parameter.
*/
std::string attack_type::weapon_specials(bool only_active, bool is_backstab) const
@ -933,7 +933,7 @@ namespace { // Helpers for attack_type::special_active()
/**
* Returns whether or not the given special is active for the specified unit,
* based on the current context (see set_specials_context).
* based on the current context (see specials_context).
* @param[in] special a weapon special WML structure
* @param[in] whom specifies which combatant we care about
* @param[in] include_backstab false if backstab specials should not be active