#include <version.h>\r
#include <revision.h>\r
\r
-#include <pico/pico_int.h>\r
+#include <pico/pico.h>\r
#include <pico/patch.h>\r
\r
static char static_buff[64];\r
// draws text to current bbp16 screen\r
static void text_out16_(int x, int y, const char *text, int color)\r
{\r
- int i, l, u, tr, tg, tb, len;\r
+ int i, lh, tr, tg, tb, len;\r
unsigned short *dest = (unsigned short *)g_screen_ptr + x + y * g_screen_width;\r
tr = (color & 0xf800) >> 8;\r
tg = (color & 0x07e0) >> 3;\r
len = p - text;\r
}\r
\r
+ lh = me_mfont_h;\r
+ if (y + lh > g_screen_height)\r
+ lh = g_screen_height - y;\r
+\r
for (i = 0; i < len; i++)\r
{\r
unsigned char *src = menu_font_data + (unsigned int)text[i] * me_mfont_w * me_mfont_h / 2;\r
unsigned short *dst = dest;\r
- for (l = 0; l < me_mfont_h; l++, dst += g_screen_width - me_mfont_w)\r
+ int u, l;\r
+\r
+ for (l = 0; l < lh; l++, dst += g_screen_width - me_mfont_w)\r
{\r
for (u = me_mfont_w / 2; u > 0; u--, src++)\r
{\r
/* ***************************************** */\r
\r
/* platform specific options and handlers */\r
+#if defined(__GP2X__)\r
#include "../gp2x/menu.c"\r
+#elif defined(PANDORA)\r
+#include "../pandora/menu.c"\r
+#else\r
+#define MENU_OPTIONS_GFX\r
+#define MENU_OPTIONS_ADV\r
+#define menu_main_plat_draw NULL\r
+#endif\r
\r
static void draw_menu_credits(void)\r
{\r
void menu_romload_prepare(const char *rom_name)\r
{\r
const char *p = rom_name + strlen(rom_name);\r
+ int i;\r
\r
while (p > rom_name && *p != '/')\r
p--;\r
\r
- /* fill both buffers, callbacks won't update in full */\r
- plat_video_menu_begin();\r
- smalltext_out16(1, 1, "Loading", 0xffff);\r
- smalltext_out16(1, me_sfont_h, p, 0xffff);\r
- plat_video_menu_end();\r
-\r
- plat_video_menu_begin();\r
- smalltext_out16(1, 1, "Loading", 0xffff);\r
- smalltext_out16(1, me_sfont_h, p, 0xffff);\r
- plat_video_menu_end();\r
+ /* fill all buffers, callbacks won't update in full */\r
+ for (i = 0; i < 3; i++) {\r
+ plat_video_menu_begin();\r
+ smalltext_out16(1, 1, "Loading", 0xffff);\r
+ smalltext_out16(1, me_sfont_h, p, 0xffff);\r
+ plat_video_menu_end();\r
+ }\r
\r
PicoCartLoadProgressCB = load_progress_cb;\r
PicoCDLoadProgressCB = cdload_progress_cb;\r
\r
static void draw_savestate_bg(int slot)\r
{\r
- struct PicoVideo tmp_pv;\r
- unsigned short tmp_cram[0x40];\r
- unsigned short tmp_vsram[0x40];\r
- void *tmp_vram;\r
const char *fname;\r
+ void *tmp_state;\r
\r
fname = emu_get_save_fname(1, 0, slot);\r
- if (!fname) return;\r
-\r
- tmp_vram = malloc(sizeof(Pico.vram));\r
- if (tmp_vram == NULL) return;\r
+ if (!fname)\r
+ return;\r
\r
- memcpy(tmp_vram, Pico.vram, sizeof(Pico.vram));\r
- memcpy(tmp_cram, Pico.cram, sizeof(Pico.cram));\r
- memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram));\r
- memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video));\r
+ tmp_state = PicoTmpStateSave();\r
\r
- PicoStateLoadVDP(fname);\r
+ PicoStateLoadGfx(fname);\r
\r
/* do a frame and fetch menu bg */\r
pemu_forced_frame(POPT_EN_SOFTSCALE);\r
menu_enter(1);\r
\r
- memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
- memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));\r
- memcpy(Pico.vsram, tmp_vsram, sizeof(Pico.vsram));\r
- memcpy(&Pico.video, &tmp_pv, sizeof(Pico.video));\r
- free(tmp_vram);\r
+ PicoTmpStateRestore(tmp_state);\r
}\r
\r
static void draw_savestate_menu(int menu_sel, int is_loading)\r
static int menu_sel = 10;\r
int menu_sel_max = 10;\r
unsigned long inp = 0;\r
+ int ret = 0;\r
\r
state_check_slots();\r
\r
state_slot = menu_sel;\r
if (emu_save_load_game(is_loading, 0)) {\r
me_update_msg(is_loading ? "Load failed" : "Save failed");\r
- return 0;\r
+ break;\r
}\r
- return 1;\r
+ ret = 1;\r
+ break;\r
}\r
- return 0;\r
+ break;\r
}\r
if (inp & PBTN_MBACK)\r
- return 0;\r
+ break;\r
}\r
+\r
+ return ret;\r
}\r
\r
// -------------- key config --------------\r
\r
// ------------ 32X options menu ------------\r
\r
+static const char *get_rname(const char **rn, int val, int *offs)\r
+{\r
+ int i, len, found = -1, maxlen = 0;\r
+\r
+ for (i = 0; rn[i] != NULL; i++) {\r
+ len = strlen(rn[i]);\r
+ if (len > maxlen)\r
+ maxlen = len;\r
+ if (i == val)\r
+ found = i;\r
+ }\r
+\r
+ *offs = 3 - maxlen;\r
+ if (found >= 0)\r
+ return rn[found];\r
+ return "???";\r
+}\r
+\r
+static const char *mgn_opt_renderer32x(menu_id id, int *offs)\r
+{\r
+ return get_rname(renderer_names32x, currentConfig.renderer32x, offs);\r
+}\r
+\r
static menu_entry e_menu_32x_options[] =\r
{\r
- mee_onoff("32X enabled", MA_32XOPT_ENABLE_32X, PicoOpt, POPT_EN_32X),\r
- mee_onoff("PWM sound", MA_32XOPT_PWM, PicoOpt, POPT_EN_PWM),\r
+ mee_onoff ("32X enabled", MA_32XOPT_ENABLE_32X, PicoOpt, POPT_EN_32X),\r
+ mee_range_cust("32X renderer", MA_32XOPT_RENDERER, currentConfig.renderer32x, 0, 0, mgn_opt_renderer32x),\r
+ mee_onoff ("PWM sound", MA_32XOPT_PWM, PicoOpt, POPT_EN_PWM),\r
mee_end,\r
};\r
\r
static int menu_loop_32x_options(menu_id id, int keys)\r
{\r
static int sel = 0;\r
+ int i, c;\r
+\r
+ for (c = 0; renderer_names32x != NULL && renderer_names32x[c] != NULL; )\r
+ c++;\r
+ i = me_id2offset(e_menu_32x_options, MA_32XOPT_RENDERER);\r
+ e_menu_32x_options[i].max = c > 0 ? (c - 1) : 0;\r
+\r
me_loop(e_menu_32x_options, &sel, NULL);\r
return 0;\r
}\r
mee_onoff ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM, currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG),\r
mee_onoff ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoOpt, POPT_DIS_IDLE_DET),\r
mee_onoff ("Disable frame limiter", MA_OPT2_NO_FRAME_LIMIT,currentConfig.EmuOpt, EOPT_NO_FRMLIMIT),\r
- MENU_GP2X_OPTIONS_ADV\r
+ MENU_OPTIONS_ADV\r
mee_end,\r
};\r
\r
\r
// ------------ gfx options menu ------------\r
\r
-static int mh_opt_render(menu_id id, int keys)\r
+static const char *mgn_opt_renderer(menu_id id, int *offs)\r
{\r
- plat_video_toggle_renderer((keys & PBTN_RIGHT) ? 1 : 0, 0, 1);\r
- return 0;\r
+ return get_rname(renderer_names, currentConfig.renderer, offs);\r
}\r
\r
static menu_entry e_menu_gfx_options[] =\r
{\r
- mee_cust ("Renderer", MA_OPT_RENDERER, mh_opt_render, mgn_opt_renderer),\r
- MENU_GP2X_OPTIONS_GFX\r
+ mee_range_cust("Renderer", MA_OPT_RENDERER, currentConfig.renderer, 0, 0, mgn_opt_renderer),\r
+ MENU_OPTIONS_GFX\r
mee_end,\r
};\r
\r
static int menu_loop_gfx_options(menu_id id, int keys)\r
{\r
static int sel = 0;\r
+ int i, c;\r
+\r
+ for (c = 0; renderer_names != NULL && renderer_names[c] != NULL; )\r
+ c++;\r
+ i = me_id2offset(e_menu_gfx_options, MA_OPT_RENDERER);\r
+ e_menu_gfx_options[i].max = c > 0 ? (c - 1) : 0;\r
+ me_enable(e_menu_gfx_options, MA_OPT_RENDERER, renderer_names != NULL);\r
+\r
me_loop(e_menu_gfx_options, &sel, NULL);\r
return 0;\r
}\r
notaz.gp2x.de / picodrive.git / blobdiff