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

Fix starting location labels being initially invisible...

Browse source 
...in the map editor (bug #17956)

The problem was that players are always observers when there are no
playing teams; so now skip the observer condition in that case.
This commit is contained in:
Ignacio R. Morelle 2011-05-15 03:44:48 +00:00
parent 8050523dfe
commit 8c826bf9be
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog
View file

@ -8,6 +8,9 @@ Version 1.9.6+svn:
* Multiplayer:
* New "Shuffle sides" option in MP creation list, allowing to randomize
player to side assignment (patch #1937 by Quetzalcoatl)
* User interface:
* Fix starting location labels being initially invisible in the map editor
(bug #17956).
* WML engine:
* new attribute team_name= in SSFs
* added [event][filter_side]<SSF keys> support

2
src/map_label.cpp
View file

@ -468,7 +468,7 @@ bool terrain_label::visible() const
return false;
}
return ((parent_->team_name() == team_name_ && !is_observer())
return ((parent_->team_name() == team_name_ && (!is_observer() || !team::nteams()))
|| (team_name_.empty() && parent_->visible_global_label(loc_)));
}