From 1b9636f5ed1b4e636e63c142c7e5323a36c26d73 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 29 May 2006 11:39:07 +0000
Subject: [PATCH] Revert accidental commit of local version of file in
 2006-05-29T10:46:57Z!rusty@rustcorp.com.au.

---
 src/unit_display.cpp | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/unit_display.cpp b/src/unit_display.cpp
index fad71bfbeaf..71550a5106c 100644
--- a/src/unit_display.cpp
+++ b/src/unit_display.cpp
@@ -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());