Merge pull request #479 from SamuelCho/hud_lock_fix_for_issue_456

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

Author: MageKing17

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,43 +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)
-{
-	Assert(height>0);
-	Assert(width>0);
-
-	int x1,x2,x3,x4,y1,y2,y3,y4;
-
-	x1=x;
-	y1=y-height/2;
-
-	x2=x+width/2;
-	y2=y;
-
-	x3=x;
-	y3=y+height/2;
-
-	x4=x-width/2;
-	y4=y;
-
-	gr_line(x1,y1,x2,y2);
-	gr_line(x2,y2,x3,y3);
-	gr_line(x3,y3,x4,y4);
-	gr_line(x4,y4,x1,y1);
 }
 
 HudGaugeLock::HudGaugeLock():
@@ -197,6 +156,10 @@ void HudGaugeLock::initialize()
 	Lock_gauge_draw_stamp = -1;
 	Lock_gauge_draw = 0;
 	Rotate_time_id = 1;
+	Last_lock_status = false;
+
+	Lock_anim.time_elapsed = 0.0f;
+	Lock_gauge.time_elapsed = 0.0f;
 
 	HudGauge::initialize();
 }
@@ -211,6 +174,15 @@ void HudGaugeLock::render(float frametime)
 	object		*targetp;
 	vertex lock_point;
 
+	bool locked = Player_ai->current_target_is_locked ? true : false;
+	bool reset_timers = false;
+
+	if ( locked != Last_lock_status ) {
+		// check if player lock status has changed since the last frame.
+		reset_timers = true;
+		Last_lock_status = locked;
+	}
+
 	if (Player_ai->target_objnum == -1) {
 		return;
 	}
@@ -264,26 +236,27 @@ void HudGaugeLock::render(float frametime)
 
 		// show the rotating triangles if target is locked
 		renderLockTriangles(sx, sy, frametime);
+
+		if ( reset_timers ) {
+			Lock_gauge.time_elapsed = 0.0f;
+		}
 	} else {
 		const float scaling_factor = (gr_screen.clip_center_x < gr_screen.clip_center_y) ? (gr_screen.clip_center_x / VIRTUAL_FRAME_HALF_WIDTH) : (gr_screen.clip_center_y / VIRTUAL_FRAME_HALF_HEIGHT);
 		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);
-	}
 
-	// show locked indicator
-	/*
-	if ( Lock_gauge.first_frame >= 0 ) {
-		gr_set_bitmap(Lock_gauge.first_frame);
-		gr_aabitmap(sx - Lock_gauge_half_w[gr_screen.res], sy - Lock_gauge_half_h[gr_screen.res]);
-	} else {
-		hud_draw_diamond(sx, sy, Lock_target_box_width[gr_screen.res], Lock_target_box_height[gr_screen.res]);
+		if ( reset_timers ) {
+			Lock_gauge_draw_stamp = -1;
+			Lock_gauge_draw = 0;
+			Lock_anim.time_elapsed = 0.0f;
+		}
 	}
-	*/
+
 	Lock_gauge.sx = sx - Lock_gauge_half_w;
 	Lock_gauge.sy = sy - Lock_gauge_half_h;
-	if(Player_ai->current_target_is_locked){
-		Lock_gauge.time_elapsed = 0.0f;	
+
+	if (Player_ai->current_target_is_locked) {
 		hud_anim_render(&Lock_gauge, 0.0f, 1);
 	} else {
 		hud_anim_render(&Lock_gauge, frametime, 1);
@@ -320,12 +293,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 +694,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);
+				}
 			}
 		}
 	}

code/hud/hudlock.h

@@ -43,6 +43,8 @@ class HudGaugeLock: public HudGauge
 	int Rotate_time_id;
 	int Lock_gauge_draw_stamp;
 	int Lock_gauge_draw;
+
+	bool Last_lock_status;
 public:
 	HudGaugeLock();
 	void initBitmaps(char *lock_gauge_fname, char *lock_anim_fname);