\r
void menu_init_base(void)\r
{\r
- int i, c, l;\r
+ int i, c, l, pos;\r
unsigned char *fd, *fds;\r
char buff[256];\r
FILE *f;\r
}\r
\r
// load custom font and selector (stored as 1st symbol in font table)\r
- emu_make_path(buff, "skin/font.png", sizeof(buff));\r
+ pos = plat_get_skin_dir(buff, sizeof(buff));\r
+ strcpy(buff + pos, "font.png");\r
readpng(menu_font_data, buff, READPNG_FONT,\r
MENU_X2 ? 256 : 128, MENU_X2 ? 320 : 160);\r
// default selector symbol is '>'\r
memcpy(menu_font_data, menu_font_data + ((int)'>') * me_mfont_w * me_mfont_h / 2,\r
me_mfont_w * me_mfont_h / 2);\r
- emu_make_path(buff, "skin/selector.png", sizeof(buff));\r
+ strcpy(buff + pos, "selector.png");\r
readpng(menu_font_data, buff, READPNG_SELECTOR, me_mfont_w, me_mfont_h);\r
\r
// load custom colors\r
- emu_make_path(buff, "skin/skin.txt", sizeof(buff));\r
+ strcpy(buff + pos, "skin.txt");\r
f = fopen(buff, "r");\r
if (f != NULL)\r
{\r
int i;\r
\r
sel++;\r
- for (i = sel + 1; i != sel; i++) {\r
+ for (i = sel + 1; ; i++) {\r
if (i >= len)\r
i = 1;\r
+ if (i == sel)\r
+ break;\r
\r
if (tolower_simple(namelist[i]->d_name[0]) == c)\r
break;\r