menu: add reset hotkey

diff --git a/platform/common/config_file.c b/platform/common/config_file.c
index 97369cb..e66d4e1 100644 (file)
--- a/platform/common/config_file.c
+++ b/platform/common/config_file.c
@@ -417,7 +417,7 @@ static void keys_parse_all(FILE *f)
                acts = parse_bind_val(val, &type);
                if (acts == -1) {
                        lprintf("config: unhandled action \"%s\"\n", val);
                acts = parse_bind_val(val, &type);
                if (acts == -1) {
                        lprintf("config: unhandled action \"%s\"\n", val);

-                       return;
+                       continue;

                }
 
                mystrip(var + 5);
                }
 
                mystrip(var + 5);

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 0a1b59c..6a8c940 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -1141,6 +1141,8 @@ static void run_events_ui(unsigned int which)
                emu_status_msg("SAVE SLOT %i [%s]", state_slot,\r
                        emu_check_save_file(state_slot, NULL) ? "USED" : "FREE");\r
        }\r
                emu_status_msg("SAVE SLOT %i [%s]", state_slot,\r
                        emu_check_save_file(state_slot, NULL) ? "USED" : "FREE");\r
        }\r

+       if (which & PEV_RESET)\r
+               emu_reset_game();\r

        if (which & PEV_MENU)\r
                engineState = PGS_Menu;\r
 }\r
        if (which & PEV_MENU)\r
                engineState = PGS_Menu;\r
 }\r

diff --git a/platform/common/input_pico.h b/platform/common/input_pico.h
index c2730b5..c0501d3 100644 (file)
--- a/platform/common/input_pico.h
+++ b/platform/common/input_pico.h
@@ -28,6 +28,7 @@
 #define PEVB_PICO_PNEXT 21
 #define PEVB_PICO_PPREV 20
 #define PEVB_PICO_SWINP 19
 #define PEVB_PICO_PNEXT 21
 #define PEVB_PICO_PPREV 20
 #define PEVB_PICO_SWINP 19

+#define PEVB_RESET      18

 
 #define PEV_VOL_DOWN    (1 << PEVB_VOL_DOWN)
 #define PEV_VOL_UP      (1 << PEVB_VOL_UP)
 
 #define PEV_VOL_DOWN    (1 << PEVB_VOL_DOWN)
 #define PEV_VOL_UP      (1 << PEVB_VOL_UP)


@@ -41,7 +42,8 @@
 #define PEV_PICO_PNEXT  (1 << PEVB_PICO_PNEXT)
 #define PEV_PICO_PPREV  (1 << PEVB_PICO_PPREV)
 #define PEV_PICO_SWINP  (1 << PEVB_PICO_SWINP)
 #define PEV_PICO_PNEXT  (1 << PEVB_PICO_PNEXT)
 #define PEV_PICO_PPREV  (1 << PEVB_PICO_PPREV)
 #define PEV_PICO_SWINP  (1 << PEVB_PICO_SWINP)

+#define PEV_RESET       (1 << PEVB_RESET)

 
 

-#define PEV_MASK 0x7ff80000
+#define PEV_MASK 0x7ffc0000

 
 #endif /* INCLUDE_c48097f3ff2a6a9af1cce8fd7a9b3f0c */
 
 #endif /* INCLUDE_c48097f3ff2a6a9af1cce8fd7a9b3f0c */

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index cc11638..f928f05 100644 (file)
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -312,6 +312,7 @@ me_bind_action emuctrl_actions[] =
        { "Volume Down      ", PEV_VOL_DOWN },
        { "Volume Up        ", PEV_VOL_UP },
        { "Fast forward     ", PEV_FF },
        { "Volume Down      ", PEV_VOL_DOWN },
        { "Volume Up        ", PEV_VOL_UP },
        { "Fast forward     ", PEV_FF },

+       { "Reset Game       ", PEV_RESET },

        { "Enter Menu       ", PEV_MENU },
        { "Pico Next page   ", PEV_PICO_PNEXT },
        { "Pico Prev page   ", PEV_PICO_PPREV },
        { "Enter Menu       ", PEV_MENU },
        { "Pico Next page   ", PEV_PICO_PNEXT },
        { "Pico Prev page   ", PEV_PICO_PPREV },

diff --git a/platform/common/plat_sdl.c b/platform/common/plat_sdl.c
index 3387b95..1b617d5 100644 (file)
--- a/platform/common/plat_sdl.c
+++ b/platform/common/plat_sdl.c
@@ -35,6 +35,7 @@ const struct in_default_bind in_sdl_defbinds[] __attribute__((weak)) = {
        { SDLK_RETURN, IN_BINDTYPE_PLAYER12, GBTN_START },
        { SDLK_f,      IN_BINDTYPE_PLAYER12, GBTN_MODE },
        { SDLK_ESCAPE, IN_BINDTYPE_EMU, PEVB_MENU },
        { SDLK_RETURN, IN_BINDTYPE_PLAYER12, GBTN_START },
        { SDLK_f,      IN_BINDTYPE_PLAYER12, GBTN_MODE },
        { SDLK_ESCAPE, IN_BINDTYPE_EMU, PEVB_MENU },

+       { SDLK_TAB,    IN_BINDTYPE_EMU, PEVB_RESET },

        { SDLK_F1,     IN_BINDTYPE_EMU, PEVB_STATE_SAVE },
        { SDLK_F2,     IN_BINDTYPE_EMU, PEVB_STATE_LOAD },
        { SDLK_F3,     IN_BINDTYPE_EMU, PEVB_SSLOT_PREV },
        { SDLK_F1,     IN_BINDTYPE_EMU, PEVB_STATE_SAVE },
        { SDLK_F2,     IN_BINDTYPE_EMU, PEVB_STATE_LOAD },
        { SDLK_F3,     IN_BINDTYPE_EMU, PEVB_SSLOT_PREV },

diff --git a/platform/pandora/plat.c b/platform/pandora/plat.c
index 8f8eac6..9cd5fc5 100644 (file)
--- a/platform/pandora/plat.c
+++ b/platform/pandora/plat.c
@@ -74,6 +74,7 @@ static struct in_default_bind in_evdev_defbinds[] =
        { KEY_S,        IN_BINDTYPE_PLAYER12, GBTN_B },\r
        { KEY_D,        IN_BINDTYPE_PLAYER12, GBTN_C },\r
        { KEY_ENTER,    IN_BINDTYPE_PLAYER12, GBTN_START },\r
        { KEY_S,        IN_BINDTYPE_PLAYER12, GBTN_B },\r
        { KEY_D,        IN_BINDTYPE_PLAYER12, GBTN_C },\r
        { KEY_ENTER,    IN_BINDTYPE_PLAYER12, GBTN_START },\r

+       { KEY_R,        IN_BINDTYPE_EMU, PEVB_RESET },\r

        { KEY_F,        IN_BINDTYPE_EMU, PEVB_FF },\r
        { KEY_BACKSPACE,IN_BINDTYPE_EMU, PEVB_FF },\r
        { KEY_BACKSLASH,IN_BINDTYPE_EMU, PEVB_MENU },\r
        { KEY_F,        IN_BINDTYPE_EMU, PEVB_FF },\r
        { KEY_BACKSPACE,IN_BINDTYPE_EMU, PEVB_FF },\r
        { KEY_BACKSLASH,IN_BINDTYPE_EMU, PEVB_MENU },\r