Merge pull request #2739 from AdmiralCurtiss/last-savestate-10-slots

DolphinWX: Add options to Load Last Slot 9/10 to menu.
This commit is contained in:
Lioncash 2015-07-11 22:59:33 -04:00
commit de3379a1b2
3 changed files with 5 additions and 1 deletions

View File

@ -308,7 +308,7 @@ EVT_MENU(IDM_SAVE_SELECTED_SLOT, CFrame::OnSaveCurrentSlot)
EVT_MENU(IDM_LOAD_SELECTED_SLOT, CFrame::OnLoadCurrentSlot) EVT_MENU(IDM_LOAD_SELECTED_SLOT, CFrame::OnLoadCurrentSlot)
EVT_MENU_RANGE(IDM_LOAD_SLOT_1, IDM_LOAD_SLOT_10, CFrame::OnLoadState) EVT_MENU_RANGE(IDM_LOAD_SLOT_1, IDM_LOAD_SLOT_10, CFrame::OnLoadState)
EVT_MENU_RANGE(IDM_LOAD_LAST_1, IDM_LOAD_LAST_8, CFrame::OnLoadLastState) EVT_MENU_RANGE(IDM_LOAD_LAST_1, IDM_LOAD_LAST_10, CFrame::OnLoadLastState)
EVT_MENU_RANGE(IDM_SAVE_SLOT_1, IDM_SAVE_SLOT_10, CFrame::OnSaveState) EVT_MENU_RANGE(IDM_SAVE_SLOT_1, IDM_SAVE_SLOT_10, CFrame::OnSaveState)
EVT_MENU_RANGE(IDM_SELECT_SLOT_1, IDM_SELECT_SLOT_10, CFrame::OnSelectSlot) EVT_MENU_RANGE(IDM_SELECT_SLOT_1, IDM_SELECT_SLOT_10, CFrame::OnSelectSlot)
EVT_MENU_RANGE(IDM_FRAME_SKIP_0, IDM_FRAME_SKIP_9, CFrame::OnFrameSkip) EVT_MENU_RANGE(IDM_FRAME_SKIP_0, IDM_FRAME_SKIP_9, CFrame::OnFrameSkip)

View File

@ -489,6 +489,8 @@ wxString CFrame::GetMenuLabel(int Id)
case HK_LOAD_LAST_STATE_6: case HK_LOAD_LAST_STATE_6:
case HK_LOAD_LAST_STATE_7: case HK_LOAD_LAST_STATE_7:
case HK_LOAD_LAST_STATE_8: case HK_LOAD_LAST_STATE_8:
case HK_LOAD_LAST_STATE_9:
case HK_LOAD_LAST_STATE_10:
Label = wxString::Format(_("Last %i"), Label = wxString::Format(_("Last %i"),
Id - HK_LOAD_LAST_STATE_1 + 1); Id - HK_LOAD_LAST_STATE_1 + 1);
break; break;

View File

@ -60,6 +60,8 @@ enum
IDM_LOAD_LAST_6, IDM_LOAD_LAST_6,
IDM_LOAD_LAST_7, IDM_LOAD_LAST_7,
IDM_LOAD_LAST_8, IDM_LOAD_LAST_8,
IDM_LOAD_LAST_9,
IDM_LOAD_LAST_10,
IDM_SELECT_SLOT_1, IDM_SELECT_SLOT_1,
IDM_SELECT_SLOT_2, IDM_SELECT_SLOT_2,
IDM_SELECT_SLOT_3, IDM_SELECT_SLOT_3,