notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Core option: Add neon_enhancement_no_main
[pcsx_rearmed.git]
/
frontend
/
menu.c
diff --git
a/frontend/menu.c
b/frontend/menu.c
index
8119505
..
199020d
100644
(file)
--- a/
frontend/menu.c
+++ b/
frontend/menu.c
@@
-26,6
+26,7
@@
#include "plugin_lib.h"
#include "plat.h"
#include "pcnt.h"
#include "plugin_lib.h"
#include "plat.h"
#include "pcnt.h"
+#include "cspace.h"
#include "libpicofe/plat.h"
#include "libpicofe/input.h"
#include "libpicofe/linux/in_evdev.h"
#include "libpicofe/plat.h"
#include "libpicofe/input.h"
#include "libpicofe/linux/in_evdev.h"
@@
-36,7
+37,6
@@
#include "../libpcsxcore/cheat.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../plugins/dfinput/externals.h"
#include "../libpcsxcore/cheat.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../plugins/dfinput/externals.h"
-#include "../plugins/gpulib/cspace.h"
#include "psemu_plugin_defs.h"
#include "revision.h"
#include "psemu_plugin_defs.h"
#include "revision.h"
@@
-1832,7
+1832,6
@@
static void menu_bios_warn(void)
// ------------ main menu ------------
static menu_entry e_menu_main[];
// ------------ main menu ------------
static menu_entry e_menu_main[];
-void OnFile_Exit();
static void draw_frame_main(void)
{
static void draw_frame_main(void)
{
@@
-2081,12
+2080,12
@@
static int swap_cd_multidisk(void)
static void load_pcsx_cht(void)
{
static void load_pcsx_cht(void)
{
- const char *exts[] = { "cht", NULL };
+
static
const char *exts[] = { "cht", NULL };
const char *fname;
const char *fname;
- char
path[256
];
+ char
msg[64
];
- path[0] = 0;
-
fname = menu_loop_romsel(path, sizeof(path
), exts, NULL);
+ fname = menu_loop_romsel(last_selected_fname,
+
sizeof(last_selected_fname
), exts, NULL);
if (fname == NULL)
return;
if (fname == NULL)
return;
@@
-2096,8
+2095,8
@@
static void load_pcsx_cht(void)
if (NumCheats == 0 && NumCodes == 0)
menu_update_msg("failed to load cheats");
else {
if (NumCheats == 0 && NumCodes == 0)
menu_update_msg("failed to load cheats");
else {
- snprintf(
path, sizeof(path
), "%d cheat(s) loaded", NumCheats + NumCodes);
- menu_update_msg(
path
);
+ snprintf(
msg, sizeof(msg
), "%d cheat(s) loaded", NumCheats + NumCodes);
+ menu_update_msg(
msg
);
}
me_enable(e_menu_main, MA_MAIN_CHEATS, ready_to_go && NumCheats);
}
}
me_enable(e_menu_main, MA_MAIN_CHEATS, ready_to_go && NumCheats);
}
@@
-2153,8
+2152,8
@@
static int main_menu_handler(int id, int keys)
in_menu_wait(PBTN_MOK|PBTN_MBACK, NULL, 70);
break;
case MA_MAIN_EXIT:
in_menu_wait(PBTN_MOK|PBTN_MBACK, NULL, 70);
break;
case MA_MAIN_EXIT:
-
OnFile_E
xit();
-
break
;
+
emu_core_ask_e
xit();
+
return 1
;
default:
lprintf("%s: something unknown selected\n", __FUNCTION__);
break;
default:
lprintf("%s: something unknown selected\n", __FUNCTION__);
break;
@@
-2240,7
+2239,7
@@
void menu_loop(void)
do {
me_loop_d(e_menu_main, &sel, NULL, draw_frame_main);
do {
me_loop_d(e_menu_main, &sel, NULL, draw_frame_main);
- } while (!ready_to_go);
+ } while (!ready_to_go
&& !g_emu_want_quit
);
/* wait until menu, ok, back is released */
while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))
/* wait until menu, ok, back is released */
while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))