Author: boucman
Date: Wed Apr 13 21:52:52 2011
New Revision: 49190
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49190&view=rev
Log:
apply patch2623 by Disruption : fix bug 17985 (leaders stay hiddent in status
table when discovered)
Modified:
trunk/changelog
trunk/data/core/about.cfg
trunk/src/menu_events.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=49190&r1=49189&r2=49190&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Wed Apr 13 21:52:52 2011
@@ -21,6 +21,7 @@
* Applied patch #2611: removed redundant own_side attribute
* Applied patch #2600: improved MP creation screen logging
* Added: New gui2 iterator framework.
+ * Patch #2624: Solved enemy leaders never appearing on status table on
foggy/shrouded maps, even when visible.
Version 1.9.5:
* Graphics:
Modified: trunk/data/core/about.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/about.cfg?rev=49190&r1=49189&r2=49190&view=diff
==============================================================================
--- trunk/data/core/about.cfg (original)
+++ trunk/data/core/about.cfg Wed Apr 13 21:52:52 2011
@@ -199,6 +199,10 @@
comment = "scons"
[/entry]
[entry]
+ name = "Sergio Tomas Ortiz"
+ email = "stomasortiz_AT_gmail.com"
+ [/entry]
+ [entry]
name = "Soliton"
comment = "bug fixes and various small features usually in multiplayer
context"
[/entry]
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=49190&r1=49189&r2=49190&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Wed Apr 13 21:52:52 2011
@@ -403,6 +403,7 @@
const bool known = viewing_team.knows_about_team(n,
network::nconnections() > 0);
const bool enemy = viewing_team.is_enemy(n+1);
+ bool fogged;
std::stringstream str;
const team_data data = calculate_team_data(teams_[n],n+1);
@@ -412,10 +413,10 @@
//output the number of the side first, and this will
//cause it to be displayed in the correct color
if(leader != units_.end()) {
-
+ fogged=viewing_team.fogged(leader->get_location());
// Add leader image. If it's fogged
// show only a random leader image.
- if (known || game_config::debug) {
+ if (!fogged || known || game_config::debug) {
str << IMAGE_PREFIX << leader->absolute_image();
leader_bools.push_back(true);
leader_name = leader->name();
@@ -517,6 +518,7 @@
const team& viewing_team = teams_[gui_->viewing_team()];
bool settings_table_empty = true;
+ bool fogged;
for(size_t n = 0; n != teams_.size(); ++n) {
if(teams_[n].is_empty()||teams_[n].hidden()) {
@@ -530,7 +532,8 @@
if(leader != units_.end()) {
// Add leader image. If it's fogged
// show only a random leader image.
- if (viewing_team.knows_about_team(n,
network::nconnections() > 0) || game_config::debug) {
+ fogged=viewing_team.fogged(leader->get_location());
+ if (!fogged || viewing_team.knows_about_team(n,
network::nconnections() > 0) || game_config::debug) {
str << IMAGE_PREFIX << leader->absolute_image();
leader_bools.push_back(true);
} else {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
