From 9ac39c43a131659c14d330c36729b7dcb48d31fc Mon Sep 17 00:00:00 2001 From: OV2 Date: Tue, 26 Mar 2013 15:05:17 +0100 Subject: [PATCH] win32: add slot0 --- win32/rsrc/resource.h | 20 +++++++++++--------- win32/rsrc/snes9x.rc | 2 ++ win32/wsnes9x.cpp | 44 ++++++++++++++++++++++++------------------- 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/win32/rsrc/resource.h b/win32/rsrc/resource.h index 6dfed6bf..0f6bf528 100644 --- a/win32/rsrc/resource.h +++ b/win32/rsrc/resource.h @@ -381,15 +381,17 @@ #define ID_SOUND_22050HZ 40035 #define ID_SOUND_44100HZ 40036 #define ID_SOUND_30000HZ 40037 -#define ID_FILE_SAVE1 40045 -#define ID_FILE_SAVE2 40046 -#define ID_FILE_SAVE3 40047 -#define ID_FILE_SAVE4 40048 -#define ID_FILE_SAVE5 40049 -#define ID_FILE_SAVE6 40050 -#define ID_FILE_SAVE7 40051 -#define ID_FILE_SAVE8 40052 -#define ID_FILE_SAVE9 40053 +#define ID_FILE_SAVE0 40043 +#define ID_FILE_SAVE1 40044 +#define ID_FILE_SAVE2 40045 +#define ID_FILE_SAVE3 40046 +#define ID_FILE_SAVE4 40047 +#define ID_FILE_SAVE5 40048 +#define ID_FILE_SAVE6 40049 +#define ID_FILE_SAVE7 40050 +#define ID_FILE_SAVE8 40051 +#define ID_FILE_SAVE9 40052 +#define ID_FILE_LOAD0 40053 #define ID_FILE_LOAD1 40054 #define ID_FILE_LOAD2 40055 #define ID_FILE_LOAD3 40056 diff --git a/win32/rsrc/snes9x.rc b/win32/rsrc/snes9x.rc index 5687f9f0..a3338846 100644 --- a/win32/rsrc/snes9x.rc +++ b/win32/rsrc/snes9x.rc @@ -791,6 +791,7 @@ BEGIN END POPUP "&Save Game Position" BEGIN + MENUITEM "Slot #&0", ID_FILE_SAVE0 MENUITEM "Slot #&1", ID_FILE_SAVE1 MENUITEM "Slot #&2", ID_FILE_SAVE2 MENUITEM "Slot #&3", ID_FILE_SAVE3 @@ -803,6 +804,7 @@ BEGIN END POPUP "&Load Game Position" BEGIN + MENUITEM "Slot #&0", ID_FILE_LOAD0 MENUITEM "Slot #&1", ID_FILE_LOAD1 MENUITEM "Slot #&2", ID_FILE_LOAD2 MENUITEM "Slot #&3", ID_FILE_LOAD3 diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp index 449b79ed..932c5e44 100644 --- a/win32/wsnes9x.cpp +++ b/win32/wsnes9x.cpp @@ -2247,60 +2247,66 @@ LRESULT CALLBACK WinProc( Settings.FrameAdvance = false; GUI.FrameAdvanceJustPressed = 0; break; - case ID_FILE_LOAD1: + case ID_FILE_LOAD0: FreezeUnfreeze (0, FALSE); break; - case ID_FILE_LOAD2: + case ID_FILE_LOAD1: FreezeUnfreeze (1, FALSE); break; - case ID_FILE_LOAD3: + case ID_FILE_LOAD2: FreezeUnfreeze (2, FALSE); break; - case ID_FILE_LOAD4: + case ID_FILE_LOAD3: FreezeUnfreeze (3, FALSE); break; - case ID_FILE_LOAD5: + case ID_FILE_LOAD4: FreezeUnfreeze (4, FALSE); break; - case ID_FILE_LOAD6: + case ID_FILE_LOAD5: FreezeUnfreeze (5, FALSE); break; - case ID_FILE_LOAD7: + case ID_FILE_LOAD6: FreezeUnfreeze (6, FALSE); break; - case ID_FILE_LOAD8: + case ID_FILE_LOAD7: FreezeUnfreeze (7, FALSE); break; - case ID_FILE_LOAD9: + case ID_FILE_LOAD8: FreezeUnfreeze (8, FALSE); break; - case ID_FILE_SAVE1: - FreezeUnfreeze (0, TRUE); + case ID_FILE_LOAD9: + FreezeUnfreeze (9, FALSE); break; - case ID_FILE_SAVE2: + case ID_FILE_SAVE0: + FreezeUnfreeze (0, TRUE); + break; + case ID_FILE_SAVE1: FreezeUnfreeze (1, TRUE); break; - case ID_FILE_SAVE3: + case ID_FILE_SAVE2: FreezeUnfreeze (2, TRUE); break; - case ID_FILE_SAVE4: + case ID_FILE_SAVE3: FreezeUnfreeze (3, TRUE); break; - case ID_FILE_SAVE5: + case ID_FILE_SAVE4: FreezeUnfreeze (4, TRUE); break; - case ID_FILE_SAVE6: + case ID_FILE_SAVE5: FreezeUnfreeze (5, TRUE); break; - case ID_FILE_SAVE7: + case ID_FILE_SAVE6: FreezeUnfreeze (6, TRUE); break; - case ID_FILE_SAVE8: + case ID_FILE_SAVE7: FreezeUnfreeze (7, TRUE); break; - case ID_FILE_SAVE9: + case ID_FILE_SAVE8: FreezeUnfreeze (8, TRUE); break; + case ID_FILE_SAVE9: + FreezeUnfreeze (9, TRUE); + break; case ID_CHEAT_ENTER: RestoreGUIDisplay (); S9xRemoveCheats ();