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

Quell variable hides variable warning from VC15

Browse source
This commit is contained in:
lundberg 2017-10-31 23:49:41 -05:00
parent 725815afa2
commit 81809a9dd7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game_initialization/lobby_data.cpp
View file

@ -486,7 +486,7 @@ game_info::ADDON_REQ game_info::check_addon_version_compatibility(const config&
// Use content name if provided, else fall back on the addon id.
// TODO: should this use t_string?
const std::string name = local_item.has_attribute("name")
const std::string content_name = local_item.has_attribute("name")
? local_item["name"].str()
: local_item["addon_id"].str();
@ -495,7 +495,7 @@ game_info::ADDON_REQ game_info::check_addon_version_compatibility(const config&
r.outcome = CANNOT_SATISFY;
r.message = vgettext("The host's version of <i>$addon</i> is incompatible. They have version <b>$host_ver</b> while you have version <b>$local_ver</b>.", {
{"addon", name},
{"addon", content_name},
{"host_ver", remote_ver.str()},
{"local_ver", local_ver.str()}
});
@ -509,7 +509,7 @@ game_info::ADDON_REQ game_info::check_addon_version_compatibility(const config&
r.outcome = NEED_DOWNLOAD;
r.message = vgettext("Your version of <i>$addon</i> is incompatible. You have version <b>$local_ver</b> while the host has version <b>$host_ver</b>.", {
{"addon", name},
{"addon", content_name},
{"host_ver", remote_ver.str()},
{"local_ver", local_ver.str()}
});