Merge pull request #545 from asarium/fix/iamstupid

Fix some issues from my previous PRs

Author: niffiwan

code/bmpman/bmpman.cpp

@@ -1584,7 +1584,7 @@ int bm_load_animation(const char *real_filename, int *nframes, int *fps, int *ke
 			bm_bitmaps[n + i].info.ani.eff.type = eff_type;
 			sprintf(bm_bitmaps[n + i].info.ani.eff.filename, "%s_%.4d", clean_name, i);
 
-			// gr_bm_load() returns non-0 on failure
+			// bm_load_info() returns non-0 on failure
 			if (bm_load_info(eff_type, n + i, bm_bitmaps[n + i].info.ani.eff.filename, NULL, &anim_width, &anim_height, &bpp, &c_type, &mm_lvl, &img_size)) {
 				// if we didn't get anything then bail out now
 				if (i == 0) {

code/cfile/cfile.cpp

@@ -879,6 +879,7 @@ int cfget_cfile_block()
 
 	// Dump a list of all opened files
 	mprintf(("Out of cfile blocks! Currently opened files:\n"));
+	dump_opened_files();
 
 	Assertion(false, "There are no more free cfile blocks. This means that there are too many files opened by FSO.\n"
 		"This is probably caused by a programming or scripting error where a file does not get closed."); // out of free cfile blocks