Merge pull request #504 from niffiwan/fix/shield_hit_anim_duration

The-E · The-E · commit 23aa8cb18d73 · 2016-01-04T15:40:03.000+01:00
Allow shield hit animations to play to the end
diff --git a/code/ship/shield.cpp b/code/ship/shield.cpp
@@ -447,7 +447,7 @@ void render_shield(int shield_num)
 	// don't try to draw if we don't have an ani
 	if ( sa->first_frame >= 0 )
 	{
-		frame_num = fl2i( f2fl(Missiontime - Shield_hits[shield_num].start_time) * sa->num_frames );
+		frame_num = fl2i( f2fl(Missiontime - Shield_hits[shield_num].start_time) / f2fl(SHIELD_HIT_DURATION) * sa->num_frames );
 		if ( frame_num >= sa->num_frames )	{
 			frame_num = sa->num_frames - 1;
 		} else if ( frame_num < 0 )	{

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ void render_shield(int shield_num)`
`447`	`447`	`// don't try to draw if we don't have an ani`
`448`	`448`	`if ( sa->first_frame >= 0 )`
`449`	`449`	`{`
`450`		`- frame_num = fl2i( f2fl(Missiontime - Shield_hits[shield_num].start_time) * sa->num_frames );`
	`450`	`+ frame_num = fl2i( f2fl(Missiontime - Shield_hits[shield_num].start_time) / f2fl(SHIELD_HIT_DURATION) * sa->num_frames );`
`451`	`451`	`if ( frame_num >= sa->num_frames ) {`
`452`	`452`	`frame_num = sa->num_frames - 1;`
`453`	`453`	`} else if ( frame_num < 0 ) {`