My attempt to fix the HUD lock scoping issues raised by issue #456.

Author: SamuelCho

code/hud/hudlock.cpp

@@ -35,7 +35,6 @@
 vec3d lock_world_pos;
 
 static float Lock_start_dist;
-static int Rotate_time_id = 1;	// timer id for controlling how often to rotate triangles around lock indicator
 
 int Missile_track_loop = -1;
 int Missile_lock_loop = -1;
@@ -68,9 +67,6 @@ int Lock_gauge_half_h[GR_NUM_RESOLUTIONS] = {
 	25
 };
 
-int Lock_gauge_loaded = 0;
-int Lock_gauge_draw = 0;
-int Lock_gauge_draw_stamp = -1;
 #define LOCK_GAUGE_BLINK_RATE			5			// blinks/sec
 
 int Lockspin_half_w[NUM_HUD_RETICLE_STYLES][GR_NUM_RESOLUTIONS] = {
@@ -106,18 +102,6 @@ void hud_init_missile_lock()
 	Player_ai->current_target_is_locked = 0;
 
 	Player_ai->last_secondary_index = -1;
-
-	Rotate_time_id = 1;
-
-	// Load in the frames need for the lead indicator
-	//if (!Lock_gauge_loaded) {
-	//Commented out due to changes in HUD loading behaviour. These checks are no longer needed at this point.
-
-		Lock_gauge_loaded = 1;
-		
-		Lock_gauge_draw_stamp = -1;
-		Lock_gauge_draw = 0;
-	//}
 }
 
 void hud_draw_diamond(int x, int y, int width, int height)
@@ -269,6 +253,10 @@ void HudGaugeLock::render(float frametime)
 		sx = fl2i(lock_point.screen.xyw.x) - fl2i(i2fl(Player->current_target_sx - Players[Player_num].lock_indicator_x) * scaling_factor);
 		sy = fl2i(lock_point.screen.xyw.y) - fl2i(i2fl(Player->current_target_sy - Players[Player_num].lock_indicator_y) * scaling_factor);
 		gr_unsize_screen_pos(&sx, &sy);
+
+		Lock_gauge_draw_stamp = -1;
+		Lock_gauge_draw = 0;
+		Lock_anim.time_elapsed = 0.0f;
 	}
 
 	// show locked indicator
@@ -320,12 +308,6 @@ void hud_lock_reset(float lock_time_scale)
 	Player->locking_on_center=0;
 	Player->locking_subsys_parent=-1;
 	hud_stop_looped_locking_sounds();
-
-	Lock_gauge_draw_stamp = -1;
-	Lock_gauge_draw = 0;
-
-	// reset the lock anim time elapsed
-//	Lock_anim.time_elapsed = 0.0f;
 }
 
 // Determine if the locking code has a point to track
@@ -727,7 +709,11 @@ void HudGaugeLock::renderLockTriangles(int center_x, int center_y, float frameti
 			// maybe draw the anim
 			Lock_gauge.time_elapsed = 0.0f;			
 			if(Lock_gauge_draw){
-				hud_anim_render(&Lock_anim, frametime, 1, 0, 1);
+				if ( loop_locked_anim ) {
+					hud_anim_render(&Lock_anim, frametime, 1, 1, 0);
+				} else {
+					hud_anim_render(&Lock_anim, frametime, 1, 0, 1);
+				}
 			}
 		}
 	}