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

Fix a Visual Studio compiler warning

Browse source 
Two variables called "name" were in scope simultaneously and one
shadowed the other.
This commit is contained in:
Jyrki Vesterinen 2019-04-18 21:48:35 +03:00
parent d64dafc500
commit 671f32aa62
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/units/abilities.cpp
View file

@ -274,10 +274,9 @@ namespace {
*/
bool add_ability_tooltip(const config::any_child &ab, unit_race::GENDER gender, std::vector<std::tuple<std::string, t_string,t_string,t_string>>& res, bool active)
{
const t_string& name =
gender_value(ab.cfg, gender, "name", "female_name", "name").t_str();
if (active) {
const t_string& name = gender_value(ab.cfg, gender, "name", "female_name", "name").t_str();
if (!name.empty()) {
res.emplace_back(
ab.cfg["id"],