X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fcommon%2Fmenu.c;h=a571ddd15a71205345bdeefc45a8a365bd57b174;hb=9564e73db83552dd7992c633362b0d99e14a4453;hp=1cb41c5734b03c8c9837ef6149ceba3814586331;hpb=698517be481301b4525c29873134a67b8343af3c;p=pcsx_rearmed.git

diff --git a/frontend/common/menu.c b/frontend/common/menu.c
index 1cb41c57..a571ddd1 100644
--- a/frontend/common/menu.c
+++ b/frontend/common/menu.c
@@ -652,7 +652,7 @@ static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void))
 
 /* ***************************************** */
 
-static void draw_menu_credits(void)
+static void draw_menu_credits(void (*draw_more)(void))
 {
 	const char *creds, *p;
 	int x, y, h, w, wt;
@@ -686,6 +686,9 @@ static void draw_menu_credits(void)
 			p++;
 	}
 
+	if (draw_more != NULL)
+		draw_more();
+
 	menu_draw_end();
 }
 
@@ -726,22 +729,6 @@ static void do_delete(const char *fpath, const char *fname)
 
 // -------------- ROM selector --------------
 
-// rrrr rggg gggb bbbb
-static unsigned short file2color(const char *fname)
-{
-	const char *ext = fname + strlen(fname) - 3;
-	static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso", "cue" };
-	static const char *other_exts[] = { "gmv", "pat" };
-	int i;
-
-	if (ext < fname) ext = fname;
-	for (i = 0; i < array_size(rom_exts); i++)
-		if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff; // FIXME: mk defines
-	for (i = 0; i < array_size(other_exts); i++)
-		if (strcasecmp(ext, other_exts[i]) == 0) return 0xaff5;
-	return 0xffff;
-}
-
 static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 {
 	int max_cnt, start, i, x, pos;
@@ -770,7 +757,7 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 			smalltext_out16(x, pos * me_sfont_h, "/", 0xfff6);
 			smalltext_out16(x + me_sfont_w, pos * me_sfont_h, namelist[i+1]->d_name, 0xfff6);
 		} else {
-			unsigned short color = file2color(namelist[i+1]->d_name);
+			unsigned short color = fname2color(namelist[i+1]->d_name);
 			smalltext_out16(x, pos * me_sfont_h, namelist[i+1]->d_name, color);
 		}
 	}