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

Fixup 76c2cbac46

Browse source 
Using assignment is for 1.14. We can use `boost::optional::emplace` here on master.

(cherry-picked from commit 46598681b6)
This commit is contained in:
Charles Dang 2018-03-26 10:46:42 +11:00
parent ebb980a45e
commit c27082b459
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/dialogs/attack_predictions.cpp
View file

@ -131,7 +131,7 @@ void attack_predictions::set_data(window& window, const combatant_data& attacker
boost::optional<decltype(ctx)> opp_ctx;
if(opp_weapon) {
opp_ctx = opp_weapon->specials_context(&defender.unit_, &attacker.unit_, defender.unit_.get_location(), attacker.unit_.get_location(), defender.stats_.is_attacker, weapon);
opp_ctx.emplace(opp_weapon->specials_context(&defender.unit_, &attacker.unit_, defender.unit_.get_location(), attacker.unit_.get_location(), defender.stats_.is_attacker, weapon));
}
// Get damage modifiers.