From d7b599ee5fec553b3646d6b1c8befe5c9caf0101 Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Tue, 15 Feb 2011 17:15:51 +0000
Subject: [PATCH] Hook up quick savestate & quick loadstate hotkeys and map
 them to my preferred key mapping by default

---
 BizHawk.MultiClient/Config.cs   |  2 ++
 BizHawk.MultiClient/MainForm.cs | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs
index 1794bad903..e4ca94f3d3 100644
--- a/BizHawk.MultiClient/Config.cs
+++ b/BizHawk.MultiClient/Config.cs
@@ -38,6 +38,8 @@
         public string FrameAdvanceBinding = "F";
         public string ScreenshotBinding = "F12";
         public string ToggleFullscreenBinding = "LeftAlt+Return, RightAlt+Return";
+        public string QuickSave = "I";
+        public string QuickLoad = "P";
 
         // SMS / GameGear Settings
         public bool SmsEnableFM = true;
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index c412a7982c..1c386ff053 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -138,6 +138,8 @@ namespace BizHawk.MultiClient
             controls.BindMulti("Frame Advance", Global.Config.FrameAdvanceBinding);
             controls.BindMulti("Screenshot", Global.Config.ScreenshotBinding);
             controls.BindMulti("Toggle Fullscreen", Global.Config.ToggleFullscreenBinding);
+            controls.BindMulti("Quick Save State", Global.Config.QuickSave);
+            controls.BindMulti("Quick Load State", Global.Config.QuickLoad);
             Global.ClientControls = controls;
 
             var smsControls = new Controller(SMS.SmsController);
@@ -352,6 +354,18 @@ namespace BizHawk.MultiClient
                 return;
             }
    
+            if (Global.ClientControls["Quick Save State"])
+            {
+                if (!IsNullEmulator())
+                    SaveState("QuickSave" + SaveSlot.ToString());
+            }
+
+            if (Global.ClientControls["Quick Load State"])
+            {
+                if (!IsNullEmulator())
+                    LoadState("QuickSave" + SaveSlot.ToString());
+            }
+            
             if (Global.ClientControls["Hard Reset"])
             {
                 Global.ClientControls.UnpressButton("Hard Reset");