gp2x_text_out15(x,y,buffer);\r
}\r
\r
-static void gp2x_smalltext16(int x, int y, const char *texto)\r
+static void gp2x_smalltext16(int x, int y, const char *texto, unsigned short color)\r
{\r
int i;\r
unsigned char *src;\r
int w = 0x20;\r
while (w)\r
{\r
- if( *src & w ) *dst = 0xffff;\r
+ if( *src & w ) *dst = color;\r
dst++;\r
w>>=1;\r
}\r
}\r
}\r
\r
-static void gp2x_smalltext16_lim(int x, int y, const char *texto, int max)\r
+static void gp2x_smalltext16_lim(int x, int y, const char *texto, unsigned short color, int max)\r
{\r
char buffer[320/6+1];\r
\r
if (max < 0) max = 0;\r
buffer[max] = 0;\r
\r
- gp2x_smalltext16(x, y, buffer);\r
+ gp2x_smalltext16(x, y, buffer, color);\r
}\r
\r
\r
\r
// -------------- ROM selector --------------\r
\r
+// rrrr rggg gggb bbbb\r
+static unsigned short file2color(const char *fname)\r
+{\r
+ const char *ext = fname + strlen(fname) - 3;\r
+ static const char *rom_exts[] = { "zip", "nes", "fds", "unf", "nez", "nif" }; // nif is for unif\r
+ static const char *other_exts[] = { "nsf", "ips", "fcm" };\r
+ int i;\r
+\r
+ if (ext < fname) ext = fname;\r
+ for (i = 0; i < sizeof(rom_exts)/sizeof(rom_exts[0]); i++)\r
+ if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff;\r
+ for (i = 0; i < sizeof(other_exts)/sizeof(other_exts[0]); i++)\r
+ if (strcasecmp(ext, other_exts[i]) == 0) return 0xaff5;\r
+ return 0xffff;\r
+}\r
+\r
static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)\r
{\r
int start, i, pos;\r
gp2x_fceu_darken_all();\r
\r
if(start - 2 >= 0)\r
- gp2x_smalltext16_lim(14, (start - 2)*10, curdir, 53-2);\r
+ gp2x_smalltext16_lim(14, (start - 2)*10, curdir, 0xffff, 53-2);\r
for (i = 0; i < n; i++) {\r
pos = start + i;\r
if (pos < 0) continue;\r
if (pos > 23) break;\r
if (namelist[i+1]->d_type == DT_DIR) {\r
- gp2x_smalltext16_lim(14, pos*10, "/", 1);\r
- gp2x_smalltext16_lim(14+6, pos*10, namelist[i+1]->d_name, 53-3);\r
+ gp2x_smalltext16_lim(14, pos*10, "/", 0xfff6, 1);\r
+ gp2x_smalltext16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xfff6, 53-3);\r
} else {\r
- gp2x_smalltext16_lim(14, pos*10, namelist[i+1]->d_name, 53-2);\r
+ unsigned short color = file2color(namelist[i+1]->d_name);\r
+ gp2x_smalltext16_lim(14, pos*10, namelist[i+1]->d_name, color, 53-2);\r
}\r
}\r
gp2x_text_out15(5, 120, ">");\r
if (pos < 0) return 1;\r
if (pos > 23) return 0;\r
\r
- gp2x_smalltext16_lim(14, pos*10, s ? "ON " : "OFF", 3);\r
- gp2x_smalltext16_lim(14+6*4, pos*10, type ? "S" : "R", 1);\r
- gp2x_smalltext16_lim(14+6*6, pos*10, name, 53-8);\r
+ gp2x_smalltext16_lim(14, pos*10, s ? "ON " : "OFF", 0xffff, 3);\r
+ gp2x_smalltext16_lim(14+6*4, pos*10, type ? "S" : "R", 0xffff, 1);\r
+ gp2x_smalltext16_lim(14+6*6, pos*10, name, 0xffff, 53-8);\r
\r
return 1;\r
}\r
FCEUI_ListCheats(clistcallb,0);\r
\r
pos = cheat_start + cheat_pos;\r
- if (pos < 24) gp2x_smalltext16_lim(14, pos*10, "done", 4);\r
+ if (pos < 24) gp2x_smalltext16_lim(14, pos*10, "done", 0xffff, 4);\r
\r
gp2x_text_out15(5, 120, ">");\r
menu_flip();\r
if(inp & GP2X_B) {\r
switch (menu_sel) {\r
case 0: key_config_loop(ctrl_actions, 10, 0); return;\r
- case 1: key_config_loop(ctrl_actions, 8, 1); return;\r
+ case 1: key_config_loop(ctrl_actions, 10, 1); return;\r
case 2: key_config_loop(emuctrl_actions,\r
sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]), -1); return;\r
case 3: if (!fceugi) SaveConfig(NULL); return;\r
\r
static void draw_menu_options(int menu_sel)\r
{\r
- int tl_x = 25, tl_y = 32, y;\r
+ int tl_x = 25, tl_y = 20, y;\r
char strframeskip[8], *strscaling, *strssconfirm;\r
char *mms = mmuhack_status ? "active) " : "inactive)";\r
\r
gp2x_text_out15(tl_x, y, "Scaling: %s", strscaling); // 0\r
gp2x_text_out15(tl_x, (y+=10), "Show FPS %s", Settings.showfps?"ON":"OFF"); // 1\r
gp2x_text_out15(tl_x, (y+=10), "Frameskip %s", strframeskip); // 2\r
+ gp2x_text_out15(tl_x, (y+=10), "Accurate renderer (slow) %s", Settings.accurate_mode?"ON":"OFF");\r
gp2x_text_out15(tl_x, (y+=10), "Enable sound %s", soundvol?"ON":"OFF");\r
- gp2x_text_out15(tl_x, (y+=10), "Sound Rate: %5iHz", Settings.sound_rate); // 4\r
+ gp2x_text_out15(tl_x, (y+=10), "Sound Rate: %5iHz", Settings.sound_rate); // 5\r
gp2x_text_out15(tl_x, (y+=10), "Force Region: %s",\r
- Settings.region_force == 2 ? "PAL" : Settings.region_force == 1 ? "NTSC" : "OFF"); // 5\r
+ Settings.region_force == 2 ? "PAL" : Settings.region_force == 1 ? "NTSC" : "OFF"); // 6\r
gp2x_text_out15(tl_x, (y+=10), "Turbo rate %iHz", (Settings.turbo_rate_add*60/2) >> 24);\r
- gp2x_text_out15(tl_x, (y+=10), "Confirm savestate %s", strssconfirm); // 7\r
+ gp2x_text_out15(tl_x, (y+=10), "Confirm savestate %s", strssconfirm); // 8\r
gp2x_text_out15(tl_x, (y+=10), "Save slot %i", CurrentState);\r
gp2x_text_out15(tl_x, (y+=10), "Faster RAM timings %s", Settings.ramtimings?"ON":"OFF");\r
- gp2x_text_out15(tl_x, (y+=10), "squidgehack (now %s %s", mms, Settings.mmuhack?"ON":"OFF"); // 10\r
+ gp2x_text_out15(tl_x, (y+=10), "squidgehack (now %s %s", mms, Settings.mmuhack?"ON":"OFF"); // 11\r
gp2x_text_out15(tl_x, (y+=10), "Gamma correction %i.%02i", Settings.gamma / 100, Settings.gamma%100);\r
gp2x_text_out15(tl_x, (y+=10), "Perfect VSYNC %s", Settings.perfect_vsync?"ON":"OFF");\r
- gp2x_text_out15(tl_x, (y+=10), "GP2X CPU clock %iMhz", Settings.cpuclock); // 13\r
+ gp2x_text_out15(tl_x, (y+=10), "GP2X CPU clock %iMhz", Settings.cpuclock); // 14\r
gp2x_text_out15(tl_x, (y+=10), "[FCE Ultra options]");\r
- gp2x_text_out15(tl_x, (y+=10), "Save cfg as default"); // 15\r
+ gp2x_text_out15(tl_x, (y+=10), "Save cfg as default"); // 16\r
if (fceugi)\r
gp2x_text_out15(tl_x, (y+=10), "Save cfg for current game only");\r
\r
// draw cursor\r
gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">");\r
\r
+ if (menu_sel == 3) {\r
+ gp2x_text_out15(tl_x, 210, "ROM reload required for this");\r
+ gp2x_text_out15(tl_x, 220, "setting to take effect");\r
+ } else if (menu_sel == 10 || menu_sel == 11) {\r
+ gp2x_text_out15(tl_x, 210, "Emu restart required for this");\r
+ gp2x_text_out15(tl_x, 220, "setting to take effect");\r
+ }\r
+\r
menu_darken_text_bg();\r
menu_flip();\r
}\r
static int menu_loop_options(void)\r
{\r
static int menu_sel = 0;\r
- int menu_sel_max = 15;\r
+ int ret, menu_sel_max = 16;\r
unsigned long inp = 0;\r
\r
if (fceugi) menu_sel_max++;\r
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
switch (menu_sel) {\r
- case 1: Settings.showfps = !Settings.showfps; break;\r
- case 3: soundvol = soundvol ? 0 : 50; break;\r
- case 9: Settings.ramtimings = !Settings.ramtimings; break;\r
- case 10: Settings.mmuhack = !Settings.mmuhack; break;\r
- case 12: Settings.perfect_vsync = !Settings.perfect_vsync; break;\r
- case 14: fcemenu_loop_options(); break;\r
- case 15: // done (update and write)\r
+ case 1: Settings.showfps = !Settings.showfps; break;\r
+ case 3: Settings.accurate_mode = !Settings.accurate_mode; break;\r
+ case 4: soundvol = soundvol ? 0 : 50; break;\r
+ case 10: Settings.ramtimings = !Settings.ramtimings; break;\r
+ case 11: Settings.mmuhack = !Settings.mmuhack; break;\r
+ case 13: Settings.perfect_vsync = !Settings.perfect_vsync; break;\r
+ case 15: fcemenu_loop_options(); break;\r
+ case 16: // done (update and write)\r
config_commit();\r
- SaveConfig(NULL);\r
+ ret = SaveConfig(NULL);\r
+ strcpy(menuErrorMsg, ret == 0 ? "default config saved" : "config save failed");\r
return 1;\r
- case 16: // done (update and write for current game)\r
- config_commit();\r
+ case 17: // done (update and write for current game)\r
if (lastLoadedGameName[0])\r
- SaveConfig(lastLoadedGameName);\r
+ {\r
+ config_commit();\r
+ ret = SaveConfig(lastLoadedGameName);\r
+ strcpy(menuErrorMsg, ret == 0 ? "game config saved" : "config save failed");\r
+ }\r
return 1;\r
}\r
}\r
switch (menu_sel) {\r
case 0: int_incdec(&Settings.scaling, (inp & GP2X_LEFT) ? -1 : 1, 0, 3); break;\r
case 2: int_incdec(&Settings.frameskip, (inp & GP2X_LEFT) ? -1 : 1, -1, 32); break;\r
- case 4:\r
+ case 5:\r
Settings.sound_rate = sndrate_prevnext(Settings.sound_rate, inp & GP2X_RIGHT);\r
InitSound();\r
break;\r
- case 5: int_incdec(&Settings.region_force, (inp & GP2X_LEFT) ? -1 : 1, 0, 2); break;\r
- case 6: {\r
+ case 6: int_incdec(&Settings.region_force, (inp & GP2X_LEFT) ? -1 : 1, 0, 2); break;\r
+ case 7: {\r
int hz = Settings.turbo_rate_add*60/2 >> 24;\r
int_incdec(&hz, (inp & GP2X_LEFT) ? -1 : 1, 1, 30);\r
Settings.turbo_rate_add = (hz*2 << 24) / 60 + 1;\r
break;\r
}\r
- case 7: int_incdec(&Settings.sstate_confirm, (inp & GP2X_LEFT) ? -1 : 1, 0, 3); break;\r
- case 8: int_incdec(&CurrentState, (inp & GP2X_LEFT) ? -1 : 1, 0, 9); break;\r
- case 11: int_incdec(&Settings.gamma, (inp & GP2X_LEFT) ? -1 : 1, 0, 300); break;\r
- case 13:\r
+ case 8: int_incdec(&Settings.sstate_confirm, (inp & GP2X_LEFT) ? -1 : 1, 0, 3); break;\r
+ case 9: int_incdec(&CurrentState, (inp & GP2X_LEFT) ? -1 : 1, 0, 9); break;\r
+ case 12: int_incdec(&Settings.gamma, (inp & GP2X_LEFT) ? -1 : 1, 0, 300); break;\r
+ case 14:\r
while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
Settings.cpuclock += (inp & GP2X_LEFT) ? -1 : 1;\r
if (Settings.cpuclock < 0) Settings.cpuclock = 0; // 0 ~ do not change\r
notaz.gp2x.de / fceu.git / blobdiff