upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-16 10:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

re add anim_->update_current_frame();

Browse Source 
in unit.cpp to fix infinite loop with sliver mage teleport
This commit is contained in:
Serge Martin 2006-09-21 20:45:10 +00:00
parent 243a22b3d7
commit 94ce9f7d28
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/unit.cpp
View File

@ -1854,6 +1854,7 @@ void unit::redraw_unit(display& disp,gamemap::location hex)
std::string image_name;
unit_frame current_frame;
anim_->update_current_frame();
if(anim_->animation_finished()) current_frame = anim_->get_last_frame();
else if(anim_->get_first_frame_time() > anim_->get_animation_time()) current_frame = anim_->get_first_frame();
else current_frame = anim_->get_current_frame();

6
src/unit_display.cpp
View File

@ -303,8 +303,8 @@ bool unit_attack_ranged(display& disp, unit_map& units,
halo::remove(missile_frame_halo);
missile_halo = 0;
missile_frame_halo = 0;
if(animation_time > missile_animation.get_first_frame_time() &&
animation_time < missile_animation.get_last_frame_time() &&
if(animation_time > missile_animation.get_first_frame_time() &&
animation_time < missile_animation.get_last_frame_time() &&
(!disp.fogged(b.x,b.y) || !disp.fogged(a.x,a.y))) {
const int posx = int(pos*xdst + (1.0-pos)*xsrc);
const int posy = int(pos*ydst + (1.0-pos)*ysrc);
@ -389,7 +389,7 @@ bool unit_attack_ranged(display& disp, unit_map& units,
bool unit_attack(display& disp, unit_map& units,
const gamemap::location& a, const gamemap::location& b, int damage,
const attack_type& attack, const attack_type* secondary_attack,
const attack_type& attack, const attack_type* secondary_attack,
bool update_display, int swing)
{
const bool hide = disp.update_locked() || disp.fogged(a.x,a.y) && disp.fogged(b.x,b.y)