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

Fix warning 'u' might be null

Browse source 
This was a false positive raised due to poor programming style.
This commit is contained in:
lundberg 2017-08-05 07:29:46 -05:00 • committed by Jyrki Vesterinen
parent 7b63beea89
commit c861729ac9
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/reports.cpp
View file

@ -961,20 +961,21 @@ static config unit_weapons(reports::context & rc, const unit *attacker, const ma
static config unit_weapons(reports::context & rc, const unit *u)
{
if (!u || u->attacks().empty()) return config();
map_location displayed_unit_hex = rc.screen().displayed_unit_hex();
config res;
config res = config();
if ((u != nullptr) && (!u->attacks().empty())) {
map_location displayed_unit_hex = rc.screen().displayed_unit_hex();
//TODO enable after the string frezze is lifted
//const std::string attack_headline =
// ( u->attacks().size() > 1 ) ? N_("Attacks") : N_("Attack");
//TODO enable after the string frezze is lifted
//const std::string attack_headline =
// ( u->attacks().size() > 1 ) ? N_("Attacks") : N_("Attack");
//add_text(res, /*span_color(font::weapon_details_color)
// +*/ attack_headline /*+ "</span>\n"*/ + '\n', "");
//add_text(res, /*span_color(font::weapon_details_color)
// +*/ attack_headline /*+ "</span>\n"*/ + '\n', "");
for (const attack_type &at : u->attacks())
{
attack_info(rc, at, res, *u, displayed_unit_hex);
for (const attack_type &at : u->attacks())
{
attack_info(rc, at, res, *u, displayed_unit_hex);
}
}
return res;
}