From bce9622c29882fcedf2284d0110593cc6cfd48ad Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Thu, 12 Aug 2010 06:50:03 +0000 Subject: [PATCH] win32: increased number of savestate slots. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@56025 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- ChangeLog | 3 +++ win32/gui/WndMain.c | 32 +++++++++++++++++++++++++------- win32/gui/plugin.c | 2 +- win32/resource.h | 8 ++++++++ 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11253b8a..e0a34c3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,9 @@ August 12, 2010 Wei Mingzhi * gui/Gtk2Gui.c: Likewise. * gui/LnxMain.c: Likewise. * gui/Plugin.c: Likewise. + * win32/gui/plugin.c: Likewise. + * win32/gui/WndMain.c: Likewise. + * win32/resource.h: Likewise. * po/pcsx.pot, po/*.po: Updated. August 8, 2010 Wei Mingzhi diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c index f167c0ef..2e1ae141 100644 --- a/win32/gui/WndMain.c +++ b/win32/gui/WndMain.c @@ -333,12 +333,6 @@ void OnStates_LoadOther() { } } -void OnStates_Save1() { States_Save(0); } -void OnStates_Save2() { States_Save(1); } -void OnStates_Save3() { States_Save(2); } -void OnStates_Save4() { States_Save(3); } -void OnStates_Save5() { States_Save(4); } - void OnStates_SaveOther() { OPENFILENAME ofn; char szFileName[MAXPATHLEN]; @@ -511,6 +505,10 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { case ID_FILE_STATES_LOAD_SLOT3: States_Load(2); return TRUE; case ID_FILE_STATES_LOAD_SLOT4: States_Load(3); return TRUE; case ID_FILE_STATES_LOAD_SLOT5: States_Load(4); return TRUE; + case ID_FILE_STATES_LOAD_SLOT6: States_Load(5); return TRUE; + case ID_FILE_STATES_LOAD_SLOT7: States_Load(6); return TRUE; + case ID_FILE_STATES_LOAD_SLOT8: States_Load(7); return TRUE; + case ID_FILE_STATES_LOAD_SLOT9: States_Load(8); return TRUE; case ID_FILE_STATES_LOAD_OTHER: OnStates_LoadOther(); return TRUE; case ID_FILE_STATES_SAVE_SLOT1: States_Save(0); return TRUE; @@ -518,6 +516,10 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { case ID_FILE_STATES_SAVE_SLOT3: States_Save(2); return TRUE; case ID_FILE_STATES_SAVE_SLOT4: States_Save(3); return TRUE; case ID_FILE_STATES_SAVE_SLOT5: States_Save(4); return TRUE; + case ID_FILE_STATES_SAVE_SLOT6: States_Save(5); return TRUE; + case ID_FILE_STATES_SAVE_SLOT7: States_Save(6); return TRUE; + case ID_FILE_STATES_SAVE_SLOT8: States_Save(7); return TRUE; + case ID_FILE_STATES_SAVE_SLOT9: States_Save(8); return TRUE; case ID_FILE_STATES_SAVE_OTHER: OnStates_SaveOther(); return TRUE; case ID_EMULATOR_RUN: @@ -843,7 +845,7 @@ void UpdateMcdItems(int mcd, int idc) { void McdListGetDispInfo(int mcd, int idc, LPNMHDR pnmh) { LV_DISPINFO *lpdi = (LV_DISPINFO *)pnmh; McdBlock *Info; - char buf[256]; + char buf[256]; static char buftitle[256]; Info = &Blocks[mcd - 1][lpdi->item.iItem]; @@ -1527,12 +1529,20 @@ void CreateMainMenu() { ADDSUBMENUS(1, 3, _("&Save")); ADDSUBMENUS(1, 2, _("&Load")); ADDMENUITEM(2, _("&Other..."), ID_FILE_STATES_LOAD_OTHER); + ADDMENUITEM(2, _("Slot &9"), ID_FILE_STATES_LOAD_SLOT9); + ADDMENUITEM(2, _("Slot &8"), ID_FILE_STATES_LOAD_SLOT8); + ADDMENUITEM(2, _("Slot &7"), ID_FILE_STATES_LOAD_SLOT7); + ADDMENUITEM(2, _("Slot &6"), ID_FILE_STATES_LOAD_SLOT6); ADDMENUITEM(2, _("Slot &5"), ID_FILE_STATES_LOAD_SLOT5); ADDMENUITEM(2, _("Slot &4"), ID_FILE_STATES_LOAD_SLOT4); ADDMENUITEM(2, _("Slot &3"), ID_FILE_STATES_LOAD_SLOT3); ADDMENUITEM(2, _("Slot &2"), ID_FILE_STATES_LOAD_SLOT2); ADDMENUITEM(2, _("Slot &1"), ID_FILE_STATES_LOAD_SLOT1); ADDMENUITEM(3, _("&Other..."), ID_FILE_STATES_SAVE_OTHER); + ADDMENUITEM(3, _("Slot &9"), ID_FILE_STATES_SAVE_SLOT9); + ADDMENUITEM(3, _("Slot &8"), ID_FILE_STATES_SAVE_SLOT8); + ADDMENUITEM(3, _("Slot &7"), ID_FILE_STATES_SAVE_SLOT7); + ADDMENUITEM(3, _("Slot &6"), ID_FILE_STATES_SAVE_SLOT6); ADDMENUITEM(3, _("Slot &5"), ID_FILE_STATES_SAVE_SLOT5); ADDMENUITEM(3, _("Slot &4"), ID_FILE_STATES_SAVE_SLOT4); ADDMENUITEM(3, _("Slot &3"), ID_FILE_STATES_SAVE_SLOT3); @@ -1603,12 +1613,20 @@ void CreateMainMenu() { EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT3, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT4, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT5, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT6, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT7, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT8, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT9, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_OTHER, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT1, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT2, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT3, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT4, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT5, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT6, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT7, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT8, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT9, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_OTHER, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CHEATSEARCH, MF_BYCOMMAND | MF_GRAYED); } diff --git a/win32/gui/plugin.c b/win32/gui/plugin.c index 14ff7edb..57171a34 100644 --- a/win32/gui/plugin.c +++ b/win32/gui/plugin.c @@ -94,7 +94,7 @@ void PADhandleKey(int key) { break; case VK_F2: - if (StatesC < 4) StatesC++; + if (StatesC < 8) StatesC++; else StatesC = 0; GPU_freeze(2, (GPUFreeze_t *)&StatesC); if (ShowPic) { ShowPic = 0; gpuShowPic(); } diff --git a/win32/resource.h b/win32/resource.h index 7f3bc399..54702cb6 100644 --- a/win32/resource.h +++ b/win32/resource.h @@ -319,12 +319,20 @@ #define ID_FILE_STATES_LOAD_SLOT3 40033 #define ID_FILE_STATES_LOAD_SLOT4 40034 #define ID_FILE_STATES_LOAD_SLOT5 40035 +#define ID_FILE_STATES_LOAD_SLOT6 40048 +#define ID_FILE_STATES_LOAD_SLOT7 40049 +#define ID_FILE_STATES_LOAD_SLOT8 40050 +#define ID_FILE_STATES_LOAD_SLOT9 40051 #define ID_FILE_STATES_LOAD_OTHER 40036 #define ID_FILE_STATES_SAVE_SLOT1 40037 #define ID_FILE_STATES_SAVE_SLOT2 40038 #define ID_FILE_STATES_SAVE_SLOT3 40039 #define ID_FILE_STATES_SAVE_SLOT4 40040 #define ID_FILE_STATES_SAVE_SLOT5 40041 +#define ID_FILE_STATES_SAVE_SLOT6 40052 +#define ID_FILE_STATES_SAVE_SLOT7 40053 +#define ID_FILE_STATES_SAVE_SLOT8 40054 +#define ID_FILE_STATES_SAVE_SLOT9 40055 #define ID_FILE_STATES_SAVE_OTHER 40042 #define ID_CONFIGURATION_NETPLAY 40043 #define ID_EMULATOR_SWITCH_ISO 40044