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

Unit Display: When a unit teleports, don't scroll to the source or destination hex if the unit is invisible there.

Browse source
This commit is contained in:
josteph 2018-09-24 22:39:50 +00:00
parent 6cf9d04de5
commit 180971da2b
1 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/units/udisplay.cpp
View file

@ -74,23 +74,37 @@ void teleport_unit_between(const map_location& a, const map_location& b, unit& t
if ( disp.fogged(a) && disp.fogged(b) ) {
return;
}
const display_context& dc = disp.get_disp_context();
const team& viewing_team = dc.get_team(disp.viewing_side());
// Temporarily change the unit's location to check if it's visible
// before and after the teleport.
assert(temp_unit.get_location() == a);
const bool a_visible = temp_unit.is_visible_to_team(viewing_team, false);
temp_unit.set_location(b);
const bool b_visible = temp_unit.is_visible_to_team(viewing_team, false);
temp_unit.set_location(a);
if ( !disp.fogged(a) ) { // teleport
if ( a_visible ) { // teleport
disp.invalidate(a);
temp_unit.set_facing(a.get_relative_dir(b));
disp.scroll_to_tiles(a, b, game_display::ONSCREEN, true, 0.0, false);
if ( b_visible )
disp.scroll_to_tiles(a, b, game_display::ONSCREEN, true, 0.0, false);
else
disp.scroll_to_tile(a, game_display::ONSCREEN, true, false);
unit_animator animator;
animator.add_animation(&temp_unit,"pre_teleport",a);
animator.start_animations();
animator.wait_for_end();
}
temp_unit.set_location(b);
if ( !disp.fogged(b) ) { // teleport
if ( b_visible ) { // teleport
disp.invalidate(b);
temp_unit.set_facing(a.get_relative_dir(b));
disp.scroll_to_tiles(b, a, game_display::ONSCREEN, true, 0.0, false);
if ( a_visible )
disp.scroll_to_tiles(b, a, game_display::ONSCREEN, true, 0.0, false);
else
disp.scroll_to_tile(b, game_display::ONSCREEN, true, false);
unit_animator animator;
animator.add_animation(&temp_unit,"post_teleport",b);
animator.start_animations();
@ -327,12 +341,18 @@ void unit_mover::proceed_to(unit_ptr u, std::size_t path_index, bool update, boo
// Safety check.
path_index = std::min(path_index, path_.size()-1);
for ( ; current_ < path_index; ++current_ )
for ( ; current_ < path_index; ++current_ ) {
// It is possible for paths_[current_] and paths_[current_+1] not to be adjacent.
// When that is the case, and the unit is invisible at paths_[current_], we shouldn't
// scroll to that hex.
std::vector<map_location> locs;
if (!temp_unit_ptr_->invisible(path_[current_]))
locs.push_back(path_[current_]);
if (!temp_unit_ptr_->invisible(path_[current_+1]))
locs.push_back(path_[current_+1]);
// If the unit can be seen by the viewing side while making this step:
if(!is_enemy_
|| !temp_unit_ptr_->invisible(path_[current_])
|| !temp_unit_ptr_->invisible(path_[current_ + 1])
) {
if ( !is_enemy_ || !locs.empty() )
{
// Wait for the previous step to complete before drawing the next one.
wait_for_anims();
@ -345,8 +365,7 @@ void unit_mover::proceed_to(unit_ptr u, std::size_t path_index, bool update, boo
// scroll in as much of the remaining path as possible
if ( temp_unit_ptr_->anim_comp().get_animation() )
temp_unit_ptr_->anim_comp().get_animation()->pause_animation();
disp_->scroll_to_tiles(path_.begin() + current_,
path_.end(), game_display::ONSCREEN,
disp_->scroll_to_tiles(locs, game_display::ONSCREEN,
true, false, 0.0, force_scroll_);
if ( temp_unit_ptr_->anim_comp().get_animation() )
temp_unit_ptr_->anim_comp().get_animation()->restart_animation();
@ -362,6 +381,7 @@ void unit_mover::proceed_to(unit_ptr u, std::size_t path_index, bool update, boo
teleport_unit_between(path_[current_], path_[current_+1],
*temp_unit_ptr_, *disp_);
}
}
// Update the unit's facing.
u->set_facing(temp_unit_ptr_->facing());