Author: shadowmaster
Date: Sat May 7 10:07:58 2011
New Revision: 49404
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49404&view=rev
Log:
Don't display team-based map labels to observers (bug #9648)
There's a glitch where if a player becomes observer due to the host's
use of the :control command, he/she will still be able to see his/her
team's labels until the currently playing side finishes his/her turn.
(Backported from trunk, r48572.)
Modified:
branches/1.8/changelog
branches/1.8/players_changelog
branches/1.8/src/map_label.cpp
Modified: branches/1.8/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/changelog?rev=49404&r1=49403&r2=49404&view=diff
==============================================================================
--- branches/1.8/changelog (original)
+++ branches/1.8/changelog Sat May 7 10:07:58 2011
@@ -14,6 +14,7 @@
* Multiplayer:
* A New Land:
* Award correct amount of research to units (bug #17406).
+ * Don't show team labels to observers (feature request #9648).
* User interface:
* Fix old multiplayer lobby glitches caused by the loadscreen code when
skipping to the lobby with -s <server> command line.
Modified: branches/1.8/players_changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/players_changelog?rev=49404&r1=49403&r2=49404&view=diff
==============================================================================
--- branches/1.8/players_changelog (original)
+++ branches/1.8/players_changelog Sat May 7 10:07:58 2011
@@ -11,6 +11,7 @@
* Multiplayer:
* A New Land:
* Award corrrect amount of research to units.
+ * Don't show team labels to observers.
* User interface
* Added a new version of multiplayer chat log history dialog.
Modified: branches/1.8/src/map_label.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/src/map_label.cpp?rev=49404&r1=49403&r2=49404&view=diff
==============================================================================
--- branches/1.8/src/map_label.cpp (original)
+++ branches/1.8/src/map_label.cpp Sat May 7 10:07:58 2011
@@ -478,8 +478,7 @@
return false;
}
-
- return (parent_->team_name() == team_name_
+ return ((parent_->team_name() == team_name_ && !is_observer())
|| (team_name_.empty() &&
parent_->visible_global_label(loc_)));
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
