From 541106d61130e3dbf038943e05a77168c69ac1c7 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 2 Aug 2013 20:42:30 -0400 Subject: [PATCH] Increase number of save state slots to 10. --- Source/Core/Core/Src/ConfigManager.cpp | 4 ++++ Source/Core/Core/Src/CoreParameter.h | 4 ++++ Source/Core/Core/Src/State.h | 2 +- Source/Core/DolphinWX/Src/Frame.cpp | 8 ++++++-- Source/Core/DolphinWX/Src/FrameTools.cpp | 4 ++++ Source/Core/DolphinWX/Src/GCMicDlg.cpp | 6 +++++- Source/Core/DolphinWX/Src/Globals.h | 4 ++++ Source/Core/DolphinWX/Src/HotkeyDlg.cpp | 4 ++++ 8 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 1db4353302..79f7d4686e 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -81,6 +81,8 @@ static const struct { { "LoadStateSlot6", 345 /* WXK_F6 */, 0 /* wxMOD_NONE */ }, { "LoadStateSlot7", 346 /* WXK_F7 */, 0 /* wxMOD_NONE */ }, { "LoadStateSlot8", 347 /* WXK_F8 */, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot9", 0, 0 /* wxMOD_NONE */ }, + { "LoadStateSlot10",0, 0 /* wxMOD_NONE */ }, { "SaveStateSlot1", 340 /* WXK_F1 */, 4 /* wxMOD_SHIFT */ }, { "SaveStateSlot2", 341 /* WXK_F2 */, 4 /* wxMOD_SHIFT */ }, @@ -90,6 +92,8 @@ static const struct { { "SaveStateSlot6", 345 /* WXK_F6 */, 4 /* wxMOD_SHIFT */ }, { "SaveStateSlot7", 346 /* WXK_F7 */, 4 /* wxMOD_SHIFT */ }, { "SaveStateSlot8", 347 /* WXK_F8 */, 4 /* wxMOD_SHIFT */ }, + { "SaveStateSlot9", 0, 0 /* wxMOD_NONE */ }, + { "SaveStateSlot10",0, 0 /* wxMOD_NONE */ }, { "LoadLastState1", 0, 0 /* wxMOD_NONE */ }, { "LoadLastState2", 0, 0 /* wxMOD_NONE */ }, diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index 21af1a1219..13b3ccb6f4 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -50,6 +50,8 @@ enum Hotkey HK_LOAD_STATE_SLOT_6, HK_LOAD_STATE_SLOT_7, HK_LOAD_STATE_SLOT_8, + HK_LOAD_STATE_SLOT_9, + HK_LOAD_STATE_SLOT_10, HK_SAVE_STATE_SLOT_1, HK_SAVE_STATE_SLOT_2, @@ -59,6 +61,8 @@ enum Hotkey HK_SAVE_STATE_SLOT_6, HK_SAVE_STATE_SLOT_7, HK_SAVE_STATE_SLOT_8, + HK_SAVE_STATE_SLOT_9, + HK_SAVE_STATE_SLOT_10, HK_LOAD_LAST_STATE_1, HK_LOAD_LAST_STATE_2, diff --git a/Source/Core/Core/Src/State.h b/Source/Core/Core/Src/State.h index 302e25d617..8da3a4d537 100644 --- a/Source/Core/Core/Src/State.h +++ b/Source/Core/Core/Src/State.h @@ -15,7 +15,7 @@ namespace State { // number of states -static const u32 NUM_STATES = 8; +static const u32 NUM_STATES = 10; struct StateHeader { diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 2f30669750..613cdc35ab 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -213,9 +213,9 @@ EVT_MENU(IDM_UNDOSAVESTATE, CFrame::OnUndoSaveState) EVT_MENU(IDM_LOADSTATEFILE, CFrame::OnLoadStateFromFile) EVT_MENU(IDM_SAVESTATEFILE, CFrame::OnSaveStateToFile) -EVT_MENU_RANGE(IDM_LOADSLOT1, IDM_LOADSLOT8, CFrame::OnLoadState) +EVT_MENU_RANGE(IDM_LOADSLOT1, IDM_LOADSLOT10, CFrame::OnLoadState) EVT_MENU_RANGE(IDM_LOADLAST1, IDM_LOADLAST8, CFrame::OnLoadLastState) -EVT_MENU_RANGE(IDM_SAVESLOT1, IDM_SAVESLOT8, CFrame::OnSaveState) +EVT_MENU_RANGE(IDM_SAVESLOT1, IDM_SAVESLOT10, CFrame::OnSaveState) EVT_MENU_RANGE(IDM_FRAMESKIP0, IDM_FRAMESKIP9, CFrame::OnFrameSkip) EVT_MENU_RANGE(IDM_DRIVE1, IDM_DRIVE24, CFrame::OnBootDrive) EVT_MENU_RANGE(IDM_CONNECT_WIIMOTE1, IDM_CONNECT_BALANCEBOARD, CFrame::OnConnectWiimote) @@ -756,6 +756,8 @@ int GetCmdForHotkey(unsigned int key) case HK_LOAD_STATE_SLOT_6: return IDM_LOADSLOT6; case HK_LOAD_STATE_SLOT_7: return IDM_LOADSLOT7; case HK_LOAD_STATE_SLOT_8: return IDM_LOADSLOT8; + case HK_LOAD_STATE_SLOT_9: return IDM_LOADSLOT9; + case HK_LOAD_STATE_SLOT_10: return IDM_LOADSLOT10; case HK_SAVE_STATE_SLOT_1: return IDM_SAVESLOT1; case HK_SAVE_STATE_SLOT_2: return IDM_SAVESLOT2; @@ -765,6 +767,8 @@ int GetCmdForHotkey(unsigned int key) case HK_SAVE_STATE_SLOT_6: return IDM_SAVESLOT6; case HK_SAVE_STATE_SLOT_7: return IDM_SAVESLOT7; case HK_SAVE_STATE_SLOT_8: return IDM_SAVESLOT8; + case HK_SAVE_STATE_SLOT_9: return IDM_SAVESLOT9; + case HK_SAVE_STATE_SLOT_10: return IDM_SAVESLOT10; case HK_LOAD_LAST_STATE_1: return IDM_LOADLAST1; case HK_LOAD_LAST_STATE_2: return IDM_LOADLAST2; diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 1f07d6a151..30d5cd7bb3 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -382,6 +382,8 @@ wxString CFrame::GetMenuLabel(int Id) case HK_LOAD_STATE_SLOT_6: case HK_LOAD_STATE_SLOT_7: case HK_LOAD_STATE_SLOT_8: + case HK_LOAD_STATE_SLOT_9: + case HK_LOAD_STATE_SLOT_10: Label = wxString::Format(_("Slot %i"), Id - HK_LOAD_STATE_SLOT_1 + 1); break; @@ -394,6 +396,8 @@ wxString CFrame::GetMenuLabel(int Id) case HK_SAVE_STATE_SLOT_6: case HK_SAVE_STATE_SLOT_7: case HK_SAVE_STATE_SLOT_8: + case HK_SAVE_STATE_SLOT_9: + case HK_SAVE_STATE_SLOT_10: Label = wxString::Format(_("Slot %i"), Id - HK_SAVE_STATE_SLOT_1 + 1); break; diff --git a/Source/Core/DolphinWX/Src/GCMicDlg.cpp b/Source/Core/DolphinWX/Src/GCMicDlg.cpp index 8edc86d667..50586f9484 100644 --- a/Source/Core/DolphinWX/Src/GCMicDlg.cpp +++ b/Source/Core/DolphinWX/Src/GCMicDlg.cpp @@ -193,6 +193,8 @@ void GCMicDialog::CreateHotkeyGUIControls(void) _("Load State Slot 6"), _("Load State Slot 7"), _("Load State Slot 8"), + _("Load State Slot 9"), + _("Load State Slot 10"), _("Save State Slot 1"), _("Save State Slot 2"), @@ -201,7 +203,9 @@ void GCMicDialog::CreateHotkeyGUIControls(void) _("Save State Slot 5"), _("Save State Slot 6"), _("Save State Slot 7"), - _("Save State Slot 8") + _("Save State Slot 8"), + _("Save State Slot 9"), + _("Save State Slot 10") }; const int page_breaks[3] = {HK_OPEN, HK_LOAD_STATE_SLOT_1, NUM_HOTKEYS}; diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h index ded510028d..5930427620 100644 --- a/Source/Core/DolphinWX/Src/Globals.h +++ b/Source/Core/DolphinWX/Src/Globals.h @@ -38,6 +38,8 @@ enum IDM_SAVESLOT6, IDM_SAVESLOT7, IDM_SAVESLOT8, + IDM_SAVESLOT9, + IDM_SAVESLOT10, IDM_LOADSLOT1, IDM_LOADSLOT2, IDM_LOADSLOT3, @@ -46,6 +48,8 @@ enum IDM_LOADSLOT6, IDM_LOADSLOT7, IDM_LOADSLOT8, + IDM_LOADSLOT9, + IDM_LOADSLOT10, IDM_LOADLAST1, IDM_LOADLAST2, IDM_LOADLAST3, diff --git a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp index 005a6d7598..67d540b16e 100644 --- a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp +++ b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp @@ -202,6 +202,8 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void) _("Load State Slot 6"), _("Load State Slot 7"), _("Load State Slot 8"), + _("Load State Slot 9"), + _("Load State Slot 10"), _("Save State Slot 1"), _("Save State Slot 2"), @@ -211,6 +213,8 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void) _("Save State Slot 6"), _("Save State Slot 7"), _("Save State Slot 8"), + _("Save State Slot 9"), + _("Save State Slot 10"), _("Load State Last 1"), _("Load State Last 2"),