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

Fixed an 0.7.7-CVS only bug:

Browse source 
loading HttT saved games where shroud was enabled (typically caves)
and you had an ally (e.g. dwarves, Li`sar) would cause the map to be
revealed. (This was because we were interescting the shroud maps of
all teams; even if those teams didn't have shroud enabled)
This commit is contained in:
John B. Messerly 2004-05-17 03:49:59 +00:00
parent 7ddce14d89
commit 61a8523e97
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/team.cpp
View file

@ -216,7 +216,7 @@ void team::team_info::write(config& cfg) const
cfg["shroud"] = use_shroud ? "yes" : "no";
cfg["fog"] = use_fog ? "yes" : "no";
cfg["share_maps"] = share_maps ? "yes" : "no";
cfg["share_vision"] = share_maps ? "yes" : "no";
cfg["share_vision"] = share_vision ? "yes" : "no";
if(music.empty() == false)
cfg["music"] = music;
@ -461,13 +461,13 @@ bool team::shrouded(size_t x, size_t y) const
{
bool res = side_shrouded(x,y);
if(teams == NULL || info_.team_name == "" || info_.share_maps == false || res == false)
if(!res || teams == NULL || info_.team_name == "" || !info_.share_maps)
return res;
for(std::vector<team>::const_iterator t = teams->begin(); t != teams->end(); ++t) {
if(t->info_.team_name != info_.team_name)
continue;
if(t->side_shrouded(x,y) == false)
if(t->uses_shroud() && !t->side_shrouded(x,y))
return false;
}
return true;
@ -477,14 +477,14 @@ bool team::fogged(size_t x, size_t y) const
{
bool res = side_fogged(x,y);
if(!teams || info_.team_name.empty() || !info_.share_maps || !info_.share_vision || !res ) {
if(!res || !teams || info_.team_name.empty() || !info_.share_maps || !info_.share_vision) {
return res;
}
for(std::vector<team>::const_iterator t = teams->begin(); t != teams->end(); ++t) {
if(t->info_.team_name != info_.team_name)
continue;
if(t->side_fogged(x,y) == false)
if(t->uses_fog() && !t->side_fogged(x,y))
return false;
}
return true;