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

Attack Dialog: Show the name_inactive of an inactive weapon special.

Browse source 
Fixes #4352
This commit is contained in:
josteph 2019-09-26 15:54:29 +00:00
parent 2f4c0ae227
commit e306af9ae4
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/units/abilities.cpp
View file

@ -760,7 +760,10 @@ std::string attack_type::weapon_specials(bool only_active, bool is_backstab) con
{
const bool active = special_active(sp.cfg, AFFECT_EITHER, sp.key, is_backstab);
const std::string& name = sp.cfg["name"].str();
const std::string& name =
active
? sp.cfg["name"].str()
: default_value(sp.cfg, "name_inactive", "name").str();
if (!name.empty()) {
if (!res.empty()) res += ", ";
if (only_active && !active) res += font::span_color(font::inactive_details_color);