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

Some cleanup of map_labels::set_label.

Browse source 
Two changes might warrant further explanation:
1) No need to set a property of an object (current_label->second)
   that you are about to erase.
2) Setting res to NULL when it is already NULL is a no-op. (This
   line exists because at one time res was set to something other
   than NULL.)
This commit is contained in:
JaMiT 2014-02-23 15:14:19 -06:00
parent ed3446a3e7
commit 90501cf872
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/map_label.cpp
View file

@ -143,7 +143,7 @@ const terrain_label* map_labels::set_label(const map_location& loc,
const bool visible_in_shroud,
const bool immutable)
{
terrain_label* res = 0;
terrain_label* res = NULL;
// See if there is already a label in this location for this team.
// (We do not use get_label_private() here because we might need
@ -157,15 +157,13 @@ const terrain_label* map_labels::set_label(const map_location& loc,
// Found old checking if need to erase it
if(text.str().empty())
{
current_label->second->set_text("");
res = NULL;
// Erase the old label.
delete current_label->second;
current_label_map->second.erase(loc);
current_label_map->second.erase(current_label);
// Restore the global label in the same spot, if any.
if ( terrain_label* global_label = get_label_private(loc, "") )
global_label->recalculate();
}
else
{
@ -179,7 +177,7 @@ const terrain_label* map_labels::set_label(const map_location& loc,
terrain_label* global_label = get_label_private(loc, "");
// Add the new label.
terrain_label* label = new terrain_label(text,
terrain_label* res = new terrain_label(text,
team_name,
loc,
*this,
@ -187,14 +185,11 @@ const terrain_label* map_labels::set_label(const map_location& loc,
visible_in_fog,
visible_in_shroud,
immutable);
add_label(loc,label);
res = label;
add_label(loc, res);
// Hide the old label.
if ( global_label != NULL )
global_label->recalculate();
}
return res;
}