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

change anim synchronisation for zookeeper again

Browse source
This commit is contained in:
Jérémy Rosen 2006-06-18 20:35:11 +00:00
parent 71ddc1477a
commit 787e8cf33f
3 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/unit.cpp
View file

@ -1372,10 +1372,10 @@ const surface unit::still_image() const
surface unit_image(image::get_image(loc,image::UNSCALED));
return unit_image;
}
void unit::set_standing(const display &disp,const gamemap::location& loc)
void unit::set_standing(const display &disp,const gamemap::location& loc, bool with_bars)
{
state_ = STATE_STANDING;
draw_bars_ = true;
draw_bars_ = with_bars;
offset_=0;
if(anim_) {
delete anim_;

2
src/unit.hpp
View file

@ -158,7 +158,7 @@ class unit
const surface still_image() const;
void redraw_unit(display& disp,gamemap::location hex);
void set_standing(const display& disp,const gamemap::location& loc);
void set_standing(const display& disp,const gamemap::location& loc, bool with_bars = true);
void set_defending(const display &disp,const gamemap::location& loc, int damage,const attack_type* attack);
void set_leading(const display& disp,const gamemap::location& loc);
void set_healing(const display& disp,const gamemap::location& loc);

48
src/unit_display.cpp
View file

@ -283,10 +283,12 @@ bool unit_attack_ranged(display& disp, unit_map& units,
bool sound_played = false ;
int missile_frame_halo =0;
int missile_halo =0;
while(!hide && (!defender.get_animation()->animation_finished() ||
!attacker.get_animation()->animation_finished() ||
!missile_animation.animation_finished() ||
(leader_loc.valid() && !leader->second.get_animation()->animation_finished()))) {
while(!hide && (
attacker.state() != unit::STATE_STANDING ||
defender.state() != unit::STATE_STANDING ||
!missile_animation.animation_finished() ||
(leader_loc.valid() && leader->second.state() != unit::STATE_STANDING))
){
const double pos = animation_time < missile_animation.get_first_frame_time()?1.0:
double(animation_time)/double(missile_animation.get_first_frame_time());
const int posx = int(pos*xsrc + (1.0-pos)*xdst);
@ -344,6 +346,15 @@ bool unit_attack_ranged(display& disp, unit_map& units,
}
disp.draw();
events::pump();
if(attacker.get_animation()->animation_finished()) {
attacker.set_standing(disp,a,false);
}
if(defender.get_animation()->animation_finished()) {
defender.set_standing(disp,b,false);
}
if(leader_loc.valid() && !leader->second.get_animation()->animation_finished() ) {
defender.set_standing(disp,b,false);
}
disp.non_turbo_delay();
animation_time = defender.get_animation()->get_animation_time();
missile_animation.update_current_frame();
@ -416,11 +427,10 @@ bool unit_attack(display& disp, unit_map& units,
attacker.set_attacking(disp,a,hits,attack);
start_time=minimum<int>(start_time,attacker.get_animation()->get_first_frame_time());
end_time=maximum<int>(end_time,attacker.get_animation()->get_last_frame_time());
end_time=attacker.get_animation()->get_last_frame_time();
defender.set_defending(disp,b,damage,&attack);
start_time=minimum<int>(start_time,defender.get_animation()->get_first_frame_time());
end_time=maximum<int>(end_time,defender.get_animation()->get_last_frame_time());
const gamemap::location leader_loc = under_leadership(units,a);
@ -432,7 +442,6 @@ bool unit_attack(display& disp, unit_map& units,
leader->second.set_facing(leader_loc.get_relative_dir(a));
leader->second.set_leading(disp,leader_loc);
start_time=minimum<int>(start_time,leader->second.get_animation()->get_first_frame_time());
end_time=maximum<int>(end_time,leader->second.get_animation()->get_last_frame_time());
}
@ -470,18 +479,33 @@ bool unit_attack(display& disp, unit_map& units,
if(def->second.take_hit(damage)) {
dead = true;
}
while(!hide && (!attacker.get_animation()->animation_finished() ||
!defender.get_animation()->animation_finished() ||
(leader_loc.valid() && !leader->second.get_animation()->animation_finished() ))) {
while(!hide && (
attacker.state() != unit::STATE_STANDING ||
defender.state() != unit::STATE_STANDING ||
(leader_loc.valid() && leader->second.state() != unit::STATE_STANDING))
){
const double pos = (1.0-double(animation_time)/double(end_time));
attacker.set_offset(pos*0.6);
if(attacker.state() != unit::STATE_STANDING) {
attacker.set_offset(pos*0.6);
} else {
attacker.set_offset(0.0);
}
disp.invalidate(b);
disp.invalidate(a);
if(leader_loc.valid()) disp.invalidate(leader_loc);
disp.draw();
events::pump();
if(attacker.get_animation()->animation_finished()) {
attacker.set_standing(disp,a,false);
}
if(defender.get_animation()->animation_finished()) {
defender.set_standing(disp,b,false);
}
if(leader_loc.valid() && !leader->second.get_animation()->animation_finished() ) {
defender.set_standing(disp,b,false);
}
disp.non_turbo_delay();
animation_time = attacker.get_animation()->get_animation_time();
}