upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-13 17:42:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert accidental commit of local version of file in 2006-05-29T10:46:57Z!rusty@rustcorp.com.au.

Browse Source
This commit is contained in:
Rusty Russell 2006-05-29 11:39:07 +00:00
parent 64b2269c4f
commit 1b9636f5ed
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/unit_display.cpp
View File

@ -133,14 +133,11 @@ void move_unit(display& disp, const gamemap& map, const std::vector<gamemap::loc
disp.remove_footstep(path[i]);
// Don't draw over shroud (can happen with move_unit_fake)
#if 0
bool invisible = teams[disp.viewing_team()].shrouded(path[i].x, path[i].y) &&
teams[disp.viewing_team()].shrouded(path[i+1].x, path[i+1].y);
#else
bool invisible = false;
#endif
if (u.side() != 0 && !invisible) {
bool invisible;
if(u.side() == 0) {
invisible = false;
} else {
invisible = teams[u.side()-1].is_enemy(int(disp.viewing_team()+1)) &&
u.invisible(path[i],units,teams) &&
u.invisible(path[i+1],units,teams);
@ -238,7 +235,7 @@ bool unit_attack_ranged(display& disp, unit_map& units,
wassert(leader != units.end());
leader->second.set_leading(disp,leader_loc);
}
while(!attacker.get_animation()->animation_finished() ) {
/* while(!attacker.get_animation()->animation_finished() ) {
disp.invalidate(a);
if(leader_loc.valid()) disp.invalidate(leader_loc);
disp.draw();
@ -246,7 +243,7 @@ bool unit_attack_ranged(display& disp, unit_map& units,
disp.non_turbo_delay();
}
*/
int animation_time;
@ -269,15 +266,23 @@ bool unit_attack_ranged(display& disp, unit_map& units,
const unit_animation::FRAME_DIRECTION dir = (a.x == b.x) ? unit_animation::VERTICAL:unit_animation::DIAGONAL;
defender.set_defending(disp,b,damage,&attack);
const int start_time = minimum<int>(minimum<int>(defender.get_animation()->get_first_frame_time(),
missile_animation.get_first_frame_time()),-200);
// min of attacker, defender, missile and -200
const int start_time = minimum<int>(
minimum<int>(
minimum<int>(defender.get_animation()->get_first_frame_time(),
missile_animation.get_first_frame_time()),
attacker.get_animation()->get_first_frame_time()),
-200);
missile_animation.start_animation(start_time,acceleration);
defender.restart_animation(disp,start_time);
attacker.restart_animation(disp,start_time);
animation_time = defender.get_animation()->get_animation_time();
bool sound_played = false ;
int missile_frame_halo =0;
int missile_halo =0;
while(!defender.get_animation()->animation_finished() ||
!attacker.get_animation()->animation_finished() ||
!missile_animation.animation_finished() ||
(leader_loc.valid() && !leader->second.get_animation()->animation_finished())) {
const double pos = animation_time < missile_animation.get_first_frame_time()?1.0:
double(animation_time)/double(missile_animation.get_first_frame_time());