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

Unit Description no longer accesible through Fog of War

Browse source
This commit is contained in:
uid67456 2004-02-22 16:45:23 +00:00
parent 5679890027
commit af9ab66880
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/playturn.cpp
View file

@ -1566,29 +1566,41 @@ void turn_info::unit_list()
unit_map::iterator turn_info::current_unit()
{
unit_map::iterator i = find_visible_unit(units_,
last_hex_, map_,
status_.get_time_of_day().lawful_bonus,teams_,teams_[team_num_-1]);
unit_map::iterator i = units_.end();
if(i == units_.end()) {
unit_map::iterator i = find_visible_unit(units_, selected_hex_,
map_,
if(gui_.fogged(last_hex_.x,last_hex_.y)==false){
i = find_visible_unit(units_,
last_hex_, map_,
status_.get_time_of_day().lawful_bonus,teams_,teams_[team_num_-1]);
}
if(gui_.fogged(selected_hex_.x,selected_hex_.y)==false){
if(i == units_.end()) {
unit_map::iterator i = find_visible_unit(units_, selected_hex_,
map_,
status_.get_time_of_day().lawful_bonus,teams_,teams_[team_num_-1]);
}
}
return i;
}
unit_map::const_iterator turn_info::current_unit() const
{
unit_map::const_iterator i = find_visible_unit(units_,
unit_map::const_iterator i = units_.end();
if(gui_.fogged(last_hex_.x,last_hex_.y)==false){
i = find_visible_unit(units_,
last_hex_, map_,
status_.get_time_of_day().lawful_bonus,teams_,teams_[team_num_-1]);
}
if(i == units_.end()) {
unit_map::const_iterator i = find_visible_unit(units_, selected_hex_,
map_,
status_.get_time_of_day().lawful_bonus,teams_,teams_[team_num_-1]);
if(gui_.fogged(selected_hex_.x,selected_hex_.y)==false){
if(i == units_.end()) {
i = find_visible_unit(units_, selected_hex_,
map_,
status_.get_time_of_day().lawful_bonus,teams_,teams_[team_num_-1]);
}
}
return i;