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

Display: use new team getters internally

Browse source 
currentTeam_ is what viewing_team_index returns
This commit is contained in:
Charles Dang 2024-08-31 21:05:23 -04:00
parent 725f4b3db7
commit 500e937ac9
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/display.cpp
View file

@ -673,12 +673,12 @@ const display::rect_of_hexes display::hexes_under_rect(const SDL_Rect& r) const
bool display::shrouded(const map_location& loc) const
{
return is_blindfolded() || (dont_show_all_ && dc_->teams()[currentTeam_].shrouded(loc));
return is_blindfolded() || (dont_show_all_ && viewing_team().shrouded(loc));
}
bool display::fogged(const map_location& loc) const
{
return is_blindfolded() || (dont_show_all_ && dc_->teams()[currentTeam_].fogged(loc));
return is_blindfolded() || (dont_show_all_ && viewing_team().fogged(loc));
}
int display::get_location_x(const map_location& loc) const
@ -1591,7 +1591,7 @@ void display::recalculate_minimap()
minimap_renderer_ = image::prep_minimap_for_rendering(
get_map(),
dc_->teams().empty() ? nullptr : &dc_->teams()[currentTeam_],
dc_->teams().empty() ? nullptr : &viewing_team(),
nullptr,
(selectedHex_.valid() && !is_blindfolded()) ? &reach_map_ : nullptr
);
@ -1664,7 +1664,7 @@ void display::draw_minimap_units()
for(const auto& u : dc_->units()) {
if (fogged(u.get_location()) ||
(dc_->teams()[currentTeam_].is_enemy(u.side()) &&
(viewing_team().is_enemy(u.side()) &&
u.invisible(u.get_location())) ||
u.get_hidden()) {
continue;
@ -1675,9 +1675,9 @@ void display::draw_minimap_units()
if(!prefs::get().minimap_movement_coding()) {
auto status = orb_status::allied;
if(dc_->teams()[currentTeam_].is_enemy(side)) {
if(viewing_team().is_enemy(side)) {
status = orb_status::enemy;
} else if(currentTeam_ + 1 == static_cast<unsigned>(side)) {
} else if(viewing_team().side() == side) {
status = dc_->unit_orb_status(u);
} else {
// no-op, status is already set to orb_status::allied;
@ -3206,7 +3206,7 @@ void display::invalidate_animations_location(const map_location& loc)
if(get_map().is_village(loc)) {
const int owner = dc_->village_owner(loc) - 1;
if(owner >= 0 && flags_[owner].need_update()
&& (!fogged(loc) || !dc_->teams()[currentTeam_].is_enemy(owner + 1))) {
&& (!fogged(loc) || !viewing_team().is_enemy(owner + 1))) {
invalidate(loc);
}
}

10
src/game_display.cpp
View file

@ -251,10 +251,10 @@ void game_display::draw_hex(const map_location& loc)
if(u == nullptr) {
mo_top_path = &mouseover_normal_top;
mo_bot_path = &mouseover_normal_bot;
} else if(dc_->teams()[currentTeam_].is_enemy(u->side())) {
} else if(viewing_team().is_enemy(u->side())) {
mo_top_path = &mouseover_enemy_top;
mo_bot_path = &mouseover_enemy_bot;
} else if(dc_->teams()[currentTeam_].side() == u->side()) {
} else if(viewing_team().side() == u->side()) {
mo_top_path = &mouseover_self_top;
mo_bot_path = &mouseover_self_bot;
} else {
@ -429,8 +429,8 @@ void game_display::draw_movement_info(const map_location& loc)
// When out-of-turn, it's still interesting to check out the terrain defs of the selected unit
else if (selectedHex_.valid() && loc == mouseoverHex_)
{
const unit_map::const_iterator selectedUnit = resources::gameboard->find_visible_unit(selectedHex_,dc_->teams()[currentTeam_]);
const unit_map::const_iterator mouseoveredUnit = resources::gameboard->find_visible_unit(mouseoverHex_,dc_->teams()[currentTeam_]);
const unit_map::const_iterator selectedUnit = resources::gameboard->find_visible_unit(selectedHex_,viewing_team());
const unit_map::const_iterator mouseoveredUnit = resources::gameboard->find_visible_unit(mouseoverHex_,viewing_team());
if(selectedUnit != dc_->units().end() && mouseoveredUnit == dc_->units().end()) {
// Display the def% of this terrain
int move_cost = selectedUnit->movement_cost(get_map().get_terrain(loc));
@ -626,7 +626,7 @@ void game_display::clear_attack_indicator()
std::string game_display::current_team_name() const
{
return dc_->teams()[currentTeam_].team_name();
return viewing_team().team_name();
}
void game_display::begin_game()