Merge pull request #1405 from MageKing17/bugfix/ani-unloading

Fix unloading streaming ANI files.

Author: asarium

code/anim/animplay.cpp

@@ -765,7 +765,7 @@ anim *anim_load(const char *real_filename, int cf_dir_type, int file_mapped)
 		}
 
 		// couldn't memory-map file... must be in a packfile, so stream manually
-		if ( file_mapped && !ptr->cfile_ptr ) {
+		if ( file_mapped == PAGE_FROM_MEM && !ptr->cfile_ptr ) {
 			ptr->flags &= ~ANF_MEM_MAPPED;
 			ptr->flags |= ANF_STREAMED;
 			ptr->cfile_ptr = cfopen(name, "rb", CFILE_NORMAL, cf_dir_type);

code/anim/animplay.h

@@ -40,9 +40,8 @@ typedef struct {
 
 enum
 {
-	PAGE_FROM_MEM		  = 0,
-	PAGE_FROM_DISK		  = 1,
-	PAGE_FROM_DISK_FORCED = 2
+	PAGE_FROM_DISK		  = 0,
+	PAGE_FROM_MEM		  = 1
 };
 
 extern int Anim_paused;
@@ -59,7 +58,7 @@ int				anim_stop_playing(anim_instance* anim_instance);
 int				anim_show_next_frame(anim_instance *instance, float frametime);
 void				anim_release_all_instances(int screen_id = 0);
 void				anim_release_render_instance(anim_instance* instance);
-anim			  *anim_load(const char *name, int cf_dir_type = CF_TYPE_ANY, int file_mapped = PAGE_FROM_MEM);
+anim			  *anim_load(const char *name, int cf_dir_type = CF_TYPE_ANY, int file_mapped = PAGE_FROM_DISK);
 int				anim_free(anim *ptr);
 int				anim_playing(anim_instance *ai);
 int				anim_write_frames_out(char *filename);

code/graphics/generic.cpp

@@ -323,8 +323,8 @@ void generic_anim_unload(generic_anim *ga)
 	if(ga->num_frames > 0) {
 		if(ga->streaming) {
 			if(ga->type == BM_TYPE_ANI) {
-				anim_free(ga->ani.animation);
 				free_anim_instance(ga->ani.instance);
+				anim_free(ga->ani.animation);
 			}
 			if(ga->type == BM_TYPE_EFF) {
 				if(ga->eff.next_frame >= 0) 

code/mission/missionmessage.cpp

@@ -748,11 +748,6 @@ void message_mission_free_avi(int m_index)
 	if ( (m_index < 0) || (m_index >= Num_message_avis) )
 		return;
 
-	// Make sure this code doesn't get run if the talking head guage is off
-	// helps prevent a crash on jump out if this code doesn't work right
-	if ( !hud_gauge_active(HUD_TALKING_HEAD) )
-		return;
-
 	generic_anim_unload(&Message_avis[m_index].anim_data);
 }