static void menu_prepare_bg(int use_game_bg);\r
\r
static unsigned int inp_prev = 0;\r
-static int inp_prevjoy = 0;\r
\r
static unsigned long wait_for_input(unsigned int interesting)\r
{\r
wait = 50;\r
}\r
inp_prev = ret;\r
- inp_prevjoy = 0;\r
\r
// we don't need diagonals in menus\r
if ((ret&BTN_UP) && (ret&BTN_LEFT)) ret &= ~BTN_LEFT;\r
\r
static void menu_draw_end(void)\r
{\r
- Framework2D_WaitVSync();\r
- giz_screen = Framework2D_LockBuffer();\r
+ giz_screen = Framework2D_LockBuffer(0);\r
if (giz_screen == NULL)\r
{\r
lprintf_al("%s: Framework2D_LockBuffer() returned NULL\n", __FUNCTION__);\r
memcpy32(giz_screen, (int *)menu_screen, 321*240*2/4);\r
Framework2D_UnlockBuffer();\r
giz_screen = NULL;\r
+ Framework2D_Flip(1);\r
}\r
\r
\r
BOOL bRet;\r
\r
wdir = malloc(sizeof(wdir[0]) * MAX_PATH);\r
- if (wdir == NULL) { lprintf_al("%s:%s: OOM\n", __FILE__, __LINE__); goto fail; }\r
+ if (wdir == NULL) { lprintf_al("%s:%i: OOM\n", __FILE__, __LINE__); goto fail; }\r
\r
namelist = malloc(sizeof(*namelist) * name_alloc);\r
- if (namelist == NULL) { lprintf_al("%s:%s: OOM\n", __FILE__, __LINE__); goto fail; }\r
+ if (namelist == NULL) { lprintf_al("%s:%i: OOM\n", __FILE__, __LINE__); goto fail; }\r
\r
// try to read first..\r
len = cstr2wstr(wdir, dir);\r
void *tmp;\r
name_alloc *= 2;\r
tmp = realloc(namelist, sizeof(*namelist) * name_alloc);\r
- if (tmp == NULL) { lprintf_al("%s:%s: OOM\n", __FILE__, __LINE__); goto fail; }\r
+ if (tmp == NULL) { lprintf_al("%s:%i: OOM\n", __FILE__, __LINE__); goto fail; }\r
namelist = tmp;\r
}\r
\r
if(inp & BTN_PLAY) { // save/load\r
if (menu_sel < 10) {\r
state_slot = menu_sel;\r
+ PicoStateProgressCB = emu_stateCb; /* also suitable for menu */\r
if (emu_SaveLoadGame(is_loading, 0)) {\r
strcpy(menuErrorMsg, is_loading ? "Load failed" : "Save failed");\r
return 1;\r
{ "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, ¤tConfig.PicoOpt,0x0004, 0, 0, 1 },\r
{ "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, ¤tConfig.PicoOpt,0x0001, 0, 0, 1 },\r
{ "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496,¤tConfig.PicoOpt,0x0002, 0, 0, 1 },\r
+ { "Double buffering", MB_ONOFF, MA_OPT2_DBLBUFF, ¤tConfig.EmuOpt, 0x8000, 0, 0, 1 },\r
{ "Wait for V-sync (slow)", MB_ONOFF, MA_OPT2_VSYNC, ¤tConfig.EmuOpt, 0x2000, 0, 0, 1 },\r
{ "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x0008, 0, 0, 1 },\r
{ "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x0020, 0, 0, 1 },\r
menu_entry opt_entries[] =\r
{\r
{ NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1 },\r
- { "Interlaced rend. (faster)", MB_ONOFF, MA_OPT_INTERLACED, ¤tConfig.EmuOpt, 0x4000, 0, 0, 1 },\r
+ { "Scanline mode (faster)", MB_ONOFF, MA_OPT_INTERLACED, ¤tConfig.EmuOpt, 0x4000, 0, 0, 1 },\r
{ "Scale low res mode", MB_ONOFF, MA_OPT_SCALING, ¤tConfig.scaling, 0x0001, 0, 3, 1 },\r
{ "Accurate timing (slower)", MB_ONOFF, MA_OPT_ACC_TIMING, ¤tConfig.PicoOpt, 0x0040, 0, 0, 1 },\r
{ "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES, ¤tConfig.PicoOpt, 0x0080, 0, 0, 1 },\r
menu_draw_begin(1);\r
\r
text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");\r
-text_out16(tl_x, 30, "rc1");\r
+\r
y = tl_y;\r
text_out16(tl_x, y, "Credits:");\r
text_out16(tl_x, (y+=10), "Dave: Cyclone 68000 core,");\r
{\r
// darken the active framebuffer\r
if (giz_screen == NULL)\r
- giz_screen = Framework2D_LockBuffer();\r
+ giz_screen = Framework2D_LockBuffer(1);\r
memset(bg_buffer, 0, 321*8*2);\r
menu_darken_bg(bg_buffer + 321*8*2, (char *)giz_screen + 321*8*2, 321*224, 1);\r
memset(bg_buffer + 321*232*2, 0, 321*8*2);\r