summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Src/FrameTools.cpp
diff options
context:
space:
mode:
authorXTra.KrazzY <XTra.KrazzY@gmail.com>2009-06-28 21:11:51 +0000
committerXTra.KrazzY <XTra.KrazzY@gmail.com>2009-06-28 21:11:51 +0000
commitfd47eb7b44da76f3f05f5042fcceb583ebb4f329 (patch)
tree1408c30f3d07d9c2309448a1c2475d3ba0905c31 /Source/Core/DolphinWX/Src/FrameTools.cpp
parente341985003d3f6ade48f74158a9f944ba5058896 (diff)
Save States: 1. Added "Undo Load State" which... undoes load state :)
2. Implemented saving/loading to memory buffers (very fast) for temporal states such as for "undo load state" git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3585 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/Src/FrameTools.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index ffe0d54d54..df01d7a6a8 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -137,11 +137,12 @@ void CFrame::CreateMenu()
m_pSubMenuSave = emulationMenu->AppendSubMenu(saveMenu, _T("Sa&ve State"));
saveMenu->Append(IDM_SAVESTATEFILE, _T("Save State..."));
+ loadMenu->Append(IDM_UNDOSAVESTATE, _T("Last Overwritten State\tShift+F12"));
saveMenu->AppendSeparator();
loadMenu->Append(IDM_LOADSTATEFILE, _T("Load State..."));
loadMenu->Append(IDM_LOADLASTSTATE, _T("Last Saved State\tF11"));
- loadMenu->Append(IDM_UNDOSTATE, _T("Last Overwritten State\tF12"));
+ loadMenu->Append(IDM_UNDOLOADSTATE, _T("Undo Load State\tF12"));
loadMenu->AppendSeparator();
for (int i = 1; i <= 8; i++) {
@@ -716,11 +717,17 @@ void CFrame::OnLoadLastState(wxCommandEvent& WXUNUSED (event))
State_LoadLastSaved();
}
-void CFrame::OnUndoState(wxCommandEvent& WXUNUSED (event))
+void CFrame::OnUndoLoadState(wxCommandEvent& WXUNUSED (event))
{
- State_LoadAs(FULL_STATESAVES_DIR "lastState.sav");
+ State_UndoLoadState();
}
+void CFrame::OnUndoSaveState(wxCommandEvent& WXUNUSED (event))
+{
+ State_UndoSaveState();
+}
+
+
void CFrame::OnLoadState(wxCommandEvent& event)
{
int id = event.GetId();