Add Autofire hotkey, works like auto-hold except that when pressing a regular controller key, it will map it as auto-hold+autofire (feature works identically to autofire in the GENS and VBA emulators)

This commit is contained in:
adelikat 2013-03-09 20:10:04 +00:00
parent d308f76d2c
commit c8e678aea7
5 changed files with 129 additions and 2 deletions

View File

@ -676,6 +676,7 @@ namespace BizHawk.MultiClient
public string IncreaseWindowSize = "Alt+UpArrow";
public string DecreaseWindowSize = "Alt+DownArrow";
public string AutoholdBinding = "";
public string AutoholdAutofireBinding = "";
public string AutoholdClear = "";
public string ToggleSNESBG1Binding = "";
public string ToggleSNESBG2Binding = "";

View File

@ -567,9 +567,10 @@ namespace BizHawk.MultiClient
g.DrawString(rerec, MessageFont, FixedMessagesColor, x, y);
}
if (Global.ClientControls["Autohold"])
if (Global.ClientControls["Autohold"] || Global.ClientControls["AutoholdAutofire"])
{
StringBuilder disp = new StringBuilder("Held: ");
foreach (string s in Global.StickyXORAdapter.CurrentStickies)
{
disp.Append(s);

View File

@ -564,6 +564,10 @@ namespace BizHawk.MultiClient
Global.StickyXORAdapter.MassToggleStickyState(Global.ActiveController.PressedButtons);
Global.AutofireStickyXORAdapter.MassToggleStickyState(Global.AutoFireController.PressedButtons);
}
else if (Global.ClientControls["AutoholdAutofire"])
{
Global.AutofireStickyXORAdapter.MassToggleStickyState(Global.ActiveController.PressedButtons);
}
//if (!EmulatorPaused)
//Global.ClickyVirtualPadController.FrameTick();
@ -685,7 +689,7 @@ namespace BizHawk.MultiClient
"Play Movie", "Record Movie", "Stop Movie", "Play Beginning", "Volume Up", "Volume Down", "Toggle MultiTrack", "Record All", "Record None", "Increment Player",
"Soft Reset", "Decrement Player", "Record AVI/WAV", "Stop AVI/WAV", "Toggle Menu", "Increase Speed", "Decrease Speed", "Toggle Background Input",
"Autohold", "Clear Autohold", "SNES Toggle BG 1", "SNES Toggle BG 2", "SNES Toggle BG 3", "SNES Toggle BG 4", "SNES Toggle OBJ 1", "SNES Toggle OBJ 2", "SNES Toggle OBJ 3",
"SNES Toggle OBJ 4", "Reboot Core", "Save Movie", "Virtual Pad" }
"SNES Toggle OBJ 4", "Reboot Core", "Save Movie", "Virtual Pad", "AutoholdAutofire" }
};
private void InitControls()
@ -785,6 +789,7 @@ namespace BizHawk.MultiClient
controls.BindMulti("Stop AVI/WAV", Global.Config.AVIStopBinding);
controls.BindMulti("Toggle Menu", Global.Config.ToggleMenuBinding);
controls.BindMulti("Autohold", Global.Config.AutoholdBinding);
controls.BindMulti("AutoholdAutofire", Global.Config.AutoholdAutofireBinding);
controls.BindMulti("Clear Autohold", Global.Config.AutoholdClear);
Global.ClientControls = controls;

View File

@ -226,6 +226,8 @@
this.IDB_CANCEL = new System.Windows.Forms.Button();
this.label38 = new System.Windows.Forms.Label();
this.AutoTabCheckBox = new System.Windows.Forms.CheckBox();
this.label84 = new System.Windows.Forms.Label();
this.IDW_AutoholdAutofire = new BizHawk.MultiClient.InputWidget();
this.hotkeyTabs.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
@ -252,6 +254,8 @@
//
// tabPage1
//
this.tabPage1.Controls.Add(this.label84);
this.tabPage1.Controls.Add(this.IDW_AutoholdAutofire);
this.tabPage1.Controls.Add(this.label82);
this.tabPage1.Controls.Add(this.IDW_HARDRESET);
this.tabPage1.Controls.Add(this.label83);
@ -335,6 +339,7 @@
//
this.IDW_HARDRESET.AcceptsTab = true;
this.IDW_HARDRESET.BackColor = System.Drawing.SystemColors.Window;
this.IDW_HARDRESET.Conflicted = false;
this.IDW_HARDRESET.Location = new System.Drawing.Point(93, 180);
this.IDW_HARDRESET.Name = "IDW_HARDRESET";
this.IDW_HARDRESET.Size = new System.Drawing.Size(100, 20);
@ -362,6 +367,7 @@
//
this.IDW_ClearAutohold.AcceptsTab = true;
this.IDW_ClearAutohold.BackColor = System.Drawing.SystemColors.Window;
this.IDW_ClearAutohold.Conflicted = false;
this.IDW_ClearAutohold.Location = new System.Drawing.Point(93, 274);
this.IDW_ClearAutohold.Name = "IDW_ClearAutohold";
this.IDW_ClearAutohold.Size = new System.Drawing.Size(100, 20);
@ -371,6 +377,7 @@
//
this.IDW_Autohold.AcceptsTab = true;
this.IDW_Autohold.BackColor = System.Drawing.SystemColors.Window;
this.IDW_Autohold.Conflicted = false;
this.IDW_Autohold.Location = new System.Drawing.Point(93, 250);
this.IDW_Autohold.Name = "IDW_Autohold";
this.IDW_Autohold.Size = new System.Drawing.Size(100, 20);
@ -389,6 +396,7 @@
//
this.IDW_MAXTURBO.AcceptsTab = true;
this.IDW_MAXTURBO.BackColor = System.Drawing.SystemColors.Window;
this.IDW_MAXTURBO.Conflicted = false;
this.IDW_MAXTURBO.Location = new System.Drawing.Point(93, 106);
this.IDW_MAXTURBO.Name = "IDW_MAXTURBO";
this.IDW_MAXTURBO.Size = new System.Drawing.Size(100, 20);
@ -407,6 +415,7 @@
//
this.IDW_ToggleBGInput.AcceptsTab = true;
this.IDW_ToggleBGInput.BackColor = System.Drawing.SystemColors.Window;
this.IDW_ToggleBGInput.Conflicted = false;
this.IDW_ToggleBGInput.Location = new System.Drawing.Point(292, 202);
this.IDW_ToggleBGInput.Name = "IDW_ToggleBGInput";
this.IDW_ToggleBGInput.Size = new System.Drawing.Size(100, 20);
@ -425,6 +434,7 @@
//
this.IDW_DecSpeed.AcceptsTab = true;
this.IDW_DecSpeed.BackColor = System.Drawing.SystemColors.Window;
this.IDW_DecSpeed.Conflicted = false;
this.IDW_DecSpeed.Location = new System.Drawing.Point(492, 130);
this.IDW_DecSpeed.Name = "IDW_DecSpeed";
this.IDW_DecSpeed.Size = new System.Drawing.Size(100, 20);
@ -443,6 +453,7 @@
//
this.IDW_IncSpeed.AcceptsTab = true;
this.IDW_IncSpeed.BackColor = System.Drawing.SystemColors.Window;
this.IDW_IncSpeed.Conflicted = false;
this.IDW_IncSpeed.Location = new System.Drawing.Point(492, 106);
this.IDW_IncSpeed.Name = "IDW_IncSpeed";
this.IDW_IncSpeed.Size = new System.Drawing.Size(100, 20);
@ -668,6 +679,7 @@
//
this.IDW_DecreaseWindowSize.AcceptsTab = true;
this.IDW_DecreaseWindowSize.BackColor = System.Drawing.SystemColors.Window;
this.IDW_DecreaseWindowSize.Conflicted = false;
this.IDW_DecreaseWindowSize.Location = new System.Drawing.Point(492, 82);
this.IDW_DecreaseWindowSize.Name = "IDW_DecreaseWindowSize";
this.IDW_DecreaseWindowSize.Size = new System.Drawing.Size(100, 20);
@ -677,6 +689,7 @@
//
this.IDW_IncreaseWindowSize.AcceptsTab = true;
this.IDW_IncreaseWindowSize.BackColor = System.Drawing.SystemColors.Window;
this.IDW_IncreaseWindowSize.Conflicted = false;
this.IDW_IncreaseWindowSize.Location = new System.Drawing.Point(492, 58);
this.IDW_IncreaseWindowSize.Name = "IDW_IncreaseWindowSize";
this.IDW_IncreaseWindowSize.Size = new System.Drawing.Size(100, 20);
@ -686,6 +699,7 @@
//
this.IDW_ToggleMenu.AcceptsTab = true;
this.IDW_ToggleMenu.BackColor = System.Drawing.SystemColors.Window;
this.IDW_ToggleMenu.Conflicted = false;
this.IDW_ToggleMenu.Location = new System.Drawing.Point(292, 226);
this.IDW_ToggleMenu.Name = "IDW_ToggleMenu";
this.IDW_ToggleMenu.Size = new System.Drawing.Size(100, 20);
@ -695,6 +709,7 @@
//
this.IDW_StopAVI.AcceptsTab = true;
this.IDW_StopAVI.BackColor = System.Drawing.SystemColors.Window;
this.IDW_StopAVI.Conflicted = false;
this.IDW_StopAVI.Location = new System.Drawing.Point(492, 34);
this.IDW_StopAVI.Name = "IDW_StopAVI";
this.IDW_StopAVI.Size = new System.Drawing.Size(100, 20);
@ -704,6 +719,7 @@
//
this.IDW_RecordAVI.AcceptsTab = true;
this.IDW_RecordAVI.BackColor = System.Drawing.SystemColors.Window;
this.IDW_RecordAVI.Conflicted = false;
this.IDW_RecordAVI.Location = new System.Drawing.Point(492, 10);
this.IDW_RecordAVI.Name = "IDW_RecordAVI";
this.IDW_RecordAVI.Size = new System.Drawing.Size(100, 20);
@ -713,6 +729,7 @@
//
this.IDW_RESET.AcceptsTab = true;
this.IDW_RESET.BackColor = System.Drawing.SystemColors.Window;
this.IDW_RESET.Conflicted = false;
this.IDW_RESET.Location = new System.Drawing.Point(93, 154);
this.IDW_RESET.Name = "IDW_RESET";
this.IDW_RESET.Size = new System.Drawing.Size(100, 20);
@ -722,6 +739,7 @@
//
this.IDW_UNTHROTTLE.AcceptsTab = true;
this.IDW_UNTHROTTLE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_UNTHROTTLE.Conflicted = false;
this.IDW_UNTHROTTLE.Location = new System.Drawing.Point(93, 130);
this.IDW_UNTHROTTLE.Name = "IDW_UNTHROTTLE";
this.IDW_UNTHROTTLE.Size = new System.Drawing.Size(100, 20);
@ -731,6 +749,7 @@
//
this.IDW_VOLDOWN.AcceptsTab = true;
this.IDW_VOLDOWN.BackColor = System.Drawing.SystemColors.Window;
this.IDW_VOLDOWN.Conflicted = false;
this.IDW_VOLDOWN.Location = new System.Drawing.Point(292, 274);
this.IDW_VOLDOWN.Name = "IDW_VOLDOWN";
this.IDW_VOLDOWN.Size = new System.Drawing.Size(100, 20);
@ -740,6 +759,7 @@
//
this.IDW_VOLUP.AcceptsTab = true;
this.IDW_VOLUP.BackColor = System.Drawing.SystemColors.Window;
this.IDW_VOLUP.Conflicted = false;
this.IDW_VOLUP.Location = new System.Drawing.Point(292, 250);
this.IDW_VOLUP.Name = "IDW_VOLUP";
this.IDW_VOLUP.Size = new System.Drawing.Size(100, 20);
@ -749,6 +769,7 @@
//
this.IDW_InputDisplay.AcceptsTab = true;
this.IDW_InputDisplay.BackColor = System.Drawing.SystemColors.Window;
this.IDW_InputDisplay.Conflicted = false;
this.IDW_InputDisplay.Location = new System.Drawing.Point(293, 178);
this.IDW_InputDisplay.Name = "IDW_InputDisplay";
this.IDW_InputDisplay.Size = new System.Drawing.Size(100, 20);
@ -758,6 +779,7 @@
//
this.IDW_LagCounter.AcceptsTab = true;
this.IDW_LagCounter.BackColor = System.Drawing.SystemColors.Window;
this.IDW_LagCounter.Conflicted = false;
this.IDW_LagCounter.Location = new System.Drawing.Point(293, 154);
this.IDW_LagCounter.Name = "IDW_LagCounter";
this.IDW_LagCounter.Size = new System.Drawing.Size(100, 20);
@ -767,6 +789,7 @@
//
this.IDW_FrameCounter.AcceptsTab = true;
this.IDW_FrameCounter.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FrameCounter.Conflicted = false;
this.IDW_FrameCounter.Location = new System.Drawing.Point(293, 130);
this.IDW_FrameCounter.Name = "IDW_FrameCounter";
this.IDW_FrameCounter.Size = new System.Drawing.Size(100, 20);
@ -776,6 +799,7 @@
//
this.IDW_DisplayFPS.AcceptsTab = true;
this.IDW_DisplayFPS.BackColor = System.Drawing.SystemColors.Window;
this.IDW_DisplayFPS.Conflicted = false;
this.IDW_DisplayFPS.Location = new System.Drawing.Point(292, 106);
this.IDW_DisplayFPS.Name = "IDW_DisplayFPS";
this.IDW_DisplayFPS.Size = new System.Drawing.Size(100, 20);
@ -785,6 +809,7 @@
//
this.IDW_CloseROM.AcceptsTab = true;
this.IDW_CloseROM.BackColor = System.Drawing.SystemColors.Window;
this.IDW_CloseROM.Conflicted = false;
this.IDW_CloseROM.Location = new System.Drawing.Point(293, 82);
this.IDW_CloseROM.Name = "IDW_CloseROM";
this.IDW_CloseROM.Size = new System.Drawing.Size(100, 20);
@ -794,6 +819,7 @@
//
this.IDW_OpenROM.AcceptsTab = true;
this.IDW_OpenROM.BackColor = System.Drawing.SystemColors.Window;
this.IDW_OpenROM.Conflicted = false;
this.IDW_OpenROM.Location = new System.Drawing.Point(293, 58);
this.IDW_OpenROM.Name = "IDW_OpenROM";
this.IDW_OpenROM.Size = new System.Drawing.Size(100, 20);
@ -803,6 +829,7 @@
//
this.IDW_FRAMEADVANCE.AcceptsTab = true;
this.IDW_FRAMEADVANCE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FRAMEADVANCE.Conflicted = false;
this.IDW_FRAMEADVANCE.Location = new System.Drawing.Point(93, 10);
this.IDW_FRAMEADVANCE.Name = "IDW_FRAMEADVANCE";
this.IDW_FRAMEADVANCE.Size = new System.Drawing.Size(100, 20);
@ -812,6 +839,7 @@
//
this.IDW_FULLSCREEN.AcceptsTab = true;
this.IDW_FULLSCREEN.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FULLSCREEN.Conflicted = false;
this.IDW_FULLSCREEN.Location = new System.Drawing.Point(293, 34);
this.IDW_FULLSCREEN.Name = "IDW_FULLSCREEN";
this.IDW_FULLSCREEN.Size = new System.Drawing.Size(100, 20);
@ -821,6 +849,7 @@
//
this.IDW_SCREENSHOT.AcceptsTab = true;
this.IDW_SCREENSHOT.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SCREENSHOT.Conflicted = false;
this.IDW_SCREENSHOT.Location = new System.Drawing.Point(293, 10);
this.IDW_SCREENSHOT.Name = "IDW_SCREENSHOT";
this.IDW_SCREENSHOT.Size = new System.Drawing.Size(100, 20);
@ -830,6 +859,7 @@
//
this.IDW_REWIND.AcceptsTab = true;
this.IDW_REWIND.BackColor = System.Drawing.SystemColors.Window;
this.IDW_REWIND.Conflicted = false;
this.IDW_REWIND.Location = new System.Drawing.Point(93, 34);
this.IDW_REWIND.Name = "IDW_REWIND";
this.IDW_REWIND.Size = new System.Drawing.Size(100, 20);
@ -839,6 +869,7 @@
//
this.IDW_FASTFORWARD.AcceptsTab = true;
this.IDW_FASTFORWARD.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FASTFORWARD.Conflicted = false;
this.IDW_FASTFORWARD.Location = new System.Drawing.Point(93, 82);
this.IDW_FASTFORWARD.Name = "IDW_FASTFORWARD";
this.IDW_FASTFORWARD.Size = new System.Drawing.Size(100, 20);
@ -848,6 +879,7 @@
//
this.IDW_REBOOTCORE.AcceptsTab = true;
this.IDW_REBOOTCORE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_REBOOTCORE.Conflicted = false;
this.IDW_REBOOTCORE.Location = new System.Drawing.Point(492, 154);
this.IDW_REBOOTCORE.Name = "IDW_REBOOTCORE";
this.IDW_REBOOTCORE.Size = new System.Drawing.Size(100, 20);
@ -857,6 +889,7 @@
//
this.IDW_PAUSE.AcceptsTab = true;
this.IDW_PAUSE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_PAUSE.Conflicted = false;
this.IDW_PAUSE.Location = new System.Drawing.Point(93, 58);
this.IDW_PAUSE.Name = "IDW_PAUSE";
this.IDW_PAUSE.Size = new System.Drawing.Size(100, 20);
@ -866,6 +899,7 @@
//
this.IDW_QuickLoad.AcceptsTab = true;
this.IDW_QuickLoad.BackColor = System.Drawing.SystemColors.Window;
this.IDW_QuickLoad.Conflicted = false;
this.IDW_QuickLoad.Location = new System.Drawing.Point(93, 202);
this.IDW_QuickLoad.Name = "IDW_QuickLoad";
this.IDW_QuickLoad.Size = new System.Drawing.Size(100, 20);
@ -875,6 +909,7 @@
//
this.IDW_QuickSave.AcceptsTab = true;
this.IDW_QuickSave.BackColor = System.Drawing.SystemColors.Window;
this.IDW_QuickSave.Conflicted = false;
this.IDW_QuickSave.Location = new System.Drawing.Point(93, 226);
this.IDW_QuickSave.Name = "IDW_QuickSave";
this.IDW_QuickSave.Size = new System.Drawing.Size(100, 20);
@ -962,6 +997,7 @@
// IDW_SS1
//
this.IDW_SS1.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SS1.Conflicted = false;
this.IDW_SS1.Location = new System.Drawing.Point(88, 6);
this.IDW_SS1.Name = "IDW_SS1";
this.IDW_SS1.Size = new System.Drawing.Size(100, 20);
@ -1282,6 +1318,7 @@
//
// IDW_NEXTSLOT
//
this.IDW_NEXTSLOT.Conflicted = false;
this.IDW_NEXTSLOT.Location = new System.Drawing.Point(361, 288);
this.IDW_NEXTSLOT.Name = "IDW_NEXTSLOT";
this.IDW_NEXTSLOT.Size = new System.Drawing.Size(100, 20);
@ -1289,6 +1326,7 @@
//
// IDW_PREVIOUSSLOT
//
this.IDW_PREVIOUSSLOT.Conflicted = false;
this.IDW_PREVIOUSSLOT.Location = new System.Drawing.Point(361, 265);
this.IDW_PREVIOUSSLOT.Name = "IDW_PREVIOUSSLOT";
this.IDW_PREVIOUSSLOT.Size = new System.Drawing.Size(100, 20);
@ -1296,6 +1334,7 @@
//
// IDW_LOADNAMEDSTATE
//
this.IDW_LOADNAMEDSTATE.Conflicted = false;
this.IDW_LOADNAMEDSTATE.Location = new System.Drawing.Point(155, 287);
this.IDW_LOADNAMEDSTATE.Name = "IDW_LOADNAMEDSTATE";
this.IDW_LOADNAMEDSTATE.Size = new System.Drawing.Size(100, 20);
@ -1303,6 +1342,7 @@
//
// IDW_SAVENAMEDSTATE
//
this.IDW_SAVENAMEDSTATE.Conflicted = false;
this.IDW_SAVENAMEDSTATE.Location = new System.Drawing.Point(154, 261);
this.IDW_SAVENAMEDSTATE.Name = "IDW_SAVENAMEDSTATE";
this.IDW_SAVENAMEDSTATE.Size = new System.Drawing.Size(100, 20);
@ -1310,6 +1350,7 @@
//
// IDW_ST7
//
this.IDW_ST7.Conflicted = false;
this.IDW_ST7.Location = new System.Drawing.Point(468, 150);
this.IDW_ST7.Name = "IDW_ST7";
this.IDW_ST7.Size = new System.Drawing.Size(100, 20);
@ -1317,6 +1358,7 @@
//
// IDW_ST0
//
this.IDW_ST0.Conflicted = false;
this.IDW_ST0.Location = new System.Drawing.Point(468, 222);
this.IDW_ST0.Name = "IDW_ST0";
this.IDW_ST0.Size = new System.Drawing.Size(100, 20);
@ -1324,6 +1366,7 @@
//
// IDW_ST9
//
this.IDW_ST9.Conflicted = false;
this.IDW_ST9.Location = new System.Drawing.Point(468, 198);
this.IDW_ST9.Name = "IDW_ST9";
this.IDW_ST9.Size = new System.Drawing.Size(100, 20);
@ -1331,6 +1374,7 @@
//
// IDW_ST8
//
this.IDW_ST8.Conflicted = false;
this.IDW_ST8.Location = new System.Drawing.Point(468, 174);
this.IDW_ST8.Name = "IDW_ST8";
this.IDW_ST8.Size = new System.Drawing.Size(100, 20);
@ -1338,6 +1382,7 @@
//
// IDW_ST6
//
this.IDW_ST6.Conflicted = false;
this.IDW_ST6.Location = new System.Drawing.Point(468, 126);
this.IDW_ST6.Name = "IDW_ST6";
this.IDW_ST6.Size = new System.Drawing.Size(100, 20);
@ -1345,6 +1390,7 @@
//
// IDW_ST5
//
this.IDW_ST5.Conflicted = false;
this.IDW_ST5.Location = new System.Drawing.Point(468, 102);
this.IDW_ST5.Name = "IDW_ST5";
this.IDW_ST5.Size = new System.Drawing.Size(100, 20);
@ -1352,6 +1398,7 @@
//
// IDW_ST4
//
this.IDW_ST4.Conflicted = false;
this.IDW_ST4.Location = new System.Drawing.Point(468, 78);
this.IDW_ST4.Name = "IDW_ST4";
this.IDW_ST4.Size = new System.Drawing.Size(100, 20);
@ -1359,6 +1406,7 @@
//
// IDW_ST3
//
this.IDW_ST3.Conflicted = false;
this.IDW_ST3.Location = new System.Drawing.Point(468, 54);
this.IDW_ST3.Name = "IDW_ST3";
this.IDW_ST3.Size = new System.Drawing.Size(100, 20);
@ -1366,6 +1414,7 @@
//
// IDW_ST2
//
this.IDW_ST2.Conflicted = false;
this.IDW_ST2.Location = new System.Drawing.Point(468, 30);
this.IDW_ST2.Name = "IDW_ST2";
this.IDW_ST2.Size = new System.Drawing.Size(100, 20);
@ -1373,6 +1422,7 @@
//
// IDW_ST1
//
this.IDW_ST1.Conflicted = false;
this.IDW_ST1.Location = new System.Drawing.Point(468, 6);
this.IDW_ST1.Name = "IDW_ST1";
this.IDW_ST1.Size = new System.Drawing.Size(100, 20);
@ -1380,6 +1430,7 @@
//
// IDW_LS7
//
this.IDW_LS7.Conflicted = false;
this.IDW_LS7.Location = new System.Drawing.Point(281, 150);
this.IDW_LS7.Name = "IDW_LS7";
this.IDW_LS7.Size = new System.Drawing.Size(100, 20);
@ -1387,6 +1438,7 @@
//
// IDW_LS0
//
this.IDW_LS0.Conflicted = false;
this.IDW_LS0.Location = new System.Drawing.Point(281, 222);
this.IDW_LS0.Name = "IDW_LS0";
this.IDW_LS0.Size = new System.Drawing.Size(100, 20);
@ -1394,6 +1446,7 @@
//
// IDW_LS9
//
this.IDW_LS9.Conflicted = false;
this.IDW_LS9.Location = new System.Drawing.Point(281, 198);
this.IDW_LS9.Name = "IDW_LS9";
this.IDW_LS9.Size = new System.Drawing.Size(100, 20);
@ -1401,6 +1454,7 @@
//
// IDW_LS8
//
this.IDW_LS8.Conflicted = false;
this.IDW_LS8.Location = new System.Drawing.Point(281, 174);
this.IDW_LS8.Name = "IDW_LS8";
this.IDW_LS8.Size = new System.Drawing.Size(100, 20);
@ -1408,6 +1462,7 @@
//
// IDW_LS6
//
this.IDW_LS6.Conflicted = false;
this.IDW_LS6.Location = new System.Drawing.Point(281, 126);
this.IDW_LS6.Name = "IDW_LS6";
this.IDW_LS6.Size = new System.Drawing.Size(100, 20);
@ -1415,6 +1470,7 @@
//
// IDW_LS5
//
this.IDW_LS5.Conflicted = false;
this.IDW_LS5.Location = new System.Drawing.Point(281, 102);
this.IDW_LS5.Name = "IDW_LS5";
this.IDW_LS5.Size = new System.Drawing.Size(100, 20);
@ -1422,6 +1478,7 @@
//
// IDW_LS4
//
this.IDW_LS4.Conflicted = false;
this.IDW_LS4.Location = new System.Drawing.Point(281, 78);
this.IDW_LS4.Name = "IDW_LS4";
this.IDW_LS4.Size = new System.Drawing.Size(100, 20);
@ -1429,6 +1486,7 @@
//
// IDW_LS3
//
this.IDW_LS3.Conflicted = false;
this.IDW_LS3.Location = new System.Drawing.Point(281, 54);
this.IDW_LS3.Name = "IDW_LS3";
this.IDW_LS3.Size = new System.Drawing.Size(100, 20);
@ -1436,6 +1494,7 @@
//
// IDW_LS2
//
this.IDW_LS2.Conflicted = false;
this.IDW_LS2.Location = new System.Drawing.Point(281, 30);
this.IDW_LS2.Name = "IDW_LS2";
this.IDW_LS2.Size = new System.Drawing.Size(100, 20);
@ -1443,6 +1502,7 @@
//
// IDW_LS1
//
this.IDW_LS1.Conflicted = false;
this.IDW_LS1.Location = new System.Drawing.Point(281, 6);
this.IDW_LS1.Name = "IDW_LS1";
this.IDW_LS1.Size = new System.Drawing.Size(100, 20);
@ -1450,6 +1510,7 @@
//
// IDW_SS0
//
this.IDW_SS0.Conflicted = false;
this.IDW_SS0.Location = new System.Drawing.Point(88, 222);
this.IDW_SS0.Name = "IDW_SS0";
this.IDW_SS0.Size = new System.Drawing.Size(100, 20);
@ -1457,6 +1518,7 @@
//
// IDW_SS9
//
this.IDW_SS9.Conflicted = false;
this.IDW_SS9.Location = new System.Drawing.Point(88, 198);
this.IDW_SS9.Name = "IDW_SS9";
this.IDW_SS9.Size = new System.Drawing.Size(100, 20);
@ -1464,6 +1526,7 @@
//
// IDW_SS8
//
this.IDW_SS8.Conflicted = false;
this.IDW_SS8.Location = new System.Drawing.Point(88, 174);
this.IDW_SS8.Name = "IDW_SS8";
this.IDW_SS8.Size = new System.Drawing.Size(100, 20);
@ -1471,6 +1534,7 @@
//
// IDW_SS7
//
this.IDW_SS7.Conflicted = false;
this.IDW_SS7.Location = new System.Drawing.Point(88, 150);
this.IDW_SS7.Name = "IDW_SS7";
this.IDW_SS7.Size = new System.Drawing.Size(100, 20);
@ -1478,6 +1542,7 @@
//
// IDW_SS6
//
this.IDW_SS6.Conflicted = false;
this.IDW_SS6.Location = new System.Drawing.Point(88, 126);
this.IDW_SS6.Name = "IDW_SS6";
this.IDW_SS6.Size = new System.Drawing.Size(100, 20);
@ -1485,6 +1550,7 @@
//
// IDW_SS5
//
this.IDW_SS5.Conflicted = false;
this.IDW_SS5.Location = new System.Drawing.Point(88, 102);
this.IDW_SS5.Name = "IDW_SS5";
this.IDW_SS5.Size = new System.Drawing.Size(100, 20);
@ -1492,6 +1558,7 @@
//
// IDW_SS4
//
this.IDW_SS4.Conflicted = false;
this.IDW_SS4.Location = new System.Drawing.Point(88, 78);
this.IDW_SS4.Name = "IDW_SS4";
this.IDW_SS4.Size = new System.Drawing.Size(100, 20);
@ -1499,6 +1566,7 @@
//
// IDW_SS3
//
this.IDW_SS3.Conflicted = false;
this.IDW_SS3.Location = new System.Drawing.Point(88, 54);
this.IDW_SS3.Name = "IDW_SS3";
this.IDW_SS3.Size = new System.Drawing.Size(100, 20);
@ -1506,6 +1574,7 @@
//
// IDW_SS2
//
this.IDW_SS2.Conflicted = false;
this.IDW_SS2.Location = new System.Drawing.Point(88, 30);
this.IDW_SS2.Name = "IDW_SS2";
this.IDW_SS2.Size = new System.Drawing.Size(100, 20);
@ -1547,6 +1616,7 @@
//
this.IDW_TOGGLEREADONLY.AcceptsTab = true;
this.IDW_TOGGLEREADONLY.BackColor = System.Drawing.SystemColors.Window;
this.IDW_TOGGLEREADONLY.Conflicted = false;
this.IDW_TOGGLEREADONLY.Location = new System.Drawing.Point(105, 9);
this.IDW_TOGGLEREADONLY.Name = "IDW_TOGGLEREADONLY";
this.IDW_TOGGLEREADONLY.Size = new System.Drawing.Size(100, 20);
@ -1556,6 +1626,7 @@
//
this.IDW_PLAYBEGINNING.AcceptsTab = true;
this.IDW_PLAYBEGINNING.BackColor = System.Drawing.SystemColors.Window;
this.IDW_PLAYBEGINNING.Conflicted = false;
this.IDW_PLAYBEGINNING.Location = new System.Drawing.Point(105, 113);
this.IDW_PLAYBEGINNING.Name = "IDW_PLAYBEGINNING";
this.IDW_PLAYBEGINNING.Size = new System.Drawing.Size(100, 20);
@ -1664,6 +1735,7 @@
//
this.IDW_STOPMOVIE.AcceptsTab = true;
this.IDW_STOPMOVIE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_STOPMOVIE.Conflicted = false;
this.IDW_STOPMOVIE.Location = new System.Drawing.Point(105, 87);
this.IDW_STOPMOVIE.Name = "IDW_STOPMOVIE";
this.IDW_STOPMOVIE.Size = new System.Drawing.Size(100, 20);
@ -1673,6 +1745,7 @@
//
this.IDW_PLAYMOVIE.AcceptsTab = true;
this.IDW_PLAYMOVIE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_PLAYMOVIE.Conflicted = false;
this.IDW_PLAYMOVIE.Location = new System.Drawing.Point(105, 35);
this.IDW_PLAYMOVIE.Name = "IDW_PLAYMOVIE";
this.IDW_PLAYMOVIE.Size = new System.Drawing.Size(100, 20);
@ -1682,6 +1755,7 @@
//
this.IDW_RECORDMOVIE.AcceptsTab = true;
this.IDW_RECORDMOVIE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_RECORDMOVIE.Conflicted = false;
this.IDW_RECORDMOVIE.Location = new System.Drawing.Point(105, 61);
this.IDW_RECORDMOVIE.Name = "IDW_RECORDMOVIE";
this.IDW_RECORDMOVIE.Size = new System.Drawing.Size(100, 20);
@ -1691,6 +1765,7 @@
//
this.IDW_TOGGLEMTRACK.AcceptsTab = true;
this.IDW_TOGGLEMTRACK.BackColor = System.Drawing.SystemColors.Window;
this.IDW_TOGGLEMTRACK.Conflicted = false;
this.IDW_TOGGLEMTRACK.Location = new System.Drawing.Point(324, 6);
this.IDW_TOGGLEMTRACK.Name = "IDW_TOGGLEMTRACK";
this.IDW_TOGGLEMTRACK.Size = new System.Drawing.Size(100, 20);
@ -1700,6 +1775,7 @@
//
this.IDW_MTDECPLAYER.AcceptsTab = true;
this.IDW_MTDECPLAYER.BackColor = System.Drawing.SystemColors.Window;
this.IDW_MTDECPLAYER.Conflicted = false;
this.IDW_MTDECPLAYER.Location = new System.Drawing.Point(324, 110);
this.IDW_MTDECPLAYER.Name = "IDW_MTDECPLAYER";
this.IDW_MTDECPLAYER.Size = new System.Drawing.Size(100, 20);
@ -1709,6 +1785,7 @@
//
this.IDW_MTINCPLAYER.AcceptsTab = true;
this.IDW_MTINCPLAYER.BackColor = System.Drawing.SystemColors.Window;
this.IDW_MTINCPLAYER.Conflicted = false;
this.IDW_MTINCPLAYER.Location = new System.Drawing.Point(324, 84);
this.IDW_MTINCPLAYER.Name = "IDW_MTINCPLAYER";
this.IDW_MTINCPLAYER.Size = new System.Drawing.Size(100, 20);
@ -1718,6 +1795,7 @@
//
this.IDW_SELECTNONE.AcceptsTab = true;
this.IDW_SELECTNONE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SELECTNONE.Conflicted = false;
this.IDW_SELECTNONE.Location = new System.Drawing.Point(324, 58);
this.IDW_SELECTNONE.Name = "IDW_SELECTNONE";
this.IDW_SELECTNONE.Size = new System.Drawing.Size(100, 20);
@ -1727,6 +1805,7 @@
//
this.IDW_MTSELECTALL.AcceptsTab = true;
this.IDW_MTSELECTALL.BackColor = System.Drawing.SystemColors.Window;
this.IDW_MTSELECTALL.Conflicted = false;
this.IDW_MTSELECTALL.Location = new System.Drawing.Point(324, 32);
this.IDW_MTSELECTALL.Name = "IDW_MTSELECTALL";
this.IDW_MTSELECTALL.Size = new System.Drawing.Size(100, 20);
@ -1736,6 +1815,7 @@
//
this.IDW_SaveMovie.AcceptsTab = true;
this.IDW_SaveMovie.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SaveMovie.Conflicted = false;
this.IDW_SaveMovie.Location = new System.Drawing.Point(105, 139);
this.IDW_SaveMovie.Name = "IDW_SaveMovie";
this.IDW_SaveMovie.Size = new System.Drawing.Size(100, 20);
@ -1781,6 +1861,7 @@
//
this.IDW_OpenVirtualPad.AcceptsTab = true;
this.IDW_OpenVirtualPad.BackColor = System.Drawing.SystemColors.Window;
this.IDW_OpenVirtualPad.Conflicted = false;
this.IDW_OpenVirtualPad.Location = new System.Drawing.Point(87, 217);
this.IDW_OpenVirtualPad.Name = "IDW_OpenVirtualPad";
this.IDW_OpenVirtualPad.Size = new System.Drawing.Size(100, 20);
@ -1860,6 +1941,7 @@
//
// IDW_TASTudio
//
this.IDW_TASTudio.Conflicted = false;
this.IDW_TASTudio.Location = new System.Drawing.Point(87, 164);
this.IDW_TASTudio.Name = "IDW_TASTudio";
this.IDW_TASTudio.Size = new System.Drawing.Size(100, 20);
@ -1869,6 +1951,7 @@
//
this.IDW_RamWatch.AcceptsTab = true;
this.IDW_RamWatch.BackColor = System.Drawing.SystemColors.Window;
this.IDW_RamWatch.Conflicted = false;
this.IDW_RamWatch.Location = new System.Drawing.Point(87, 13);
this.IDW_RamWatch.Name = "IDW_RamWatch";
this.IDW_RamWatch.Size = new System.Drawing.Size(100, 20);
@ -1876,6 +1959,7 @@
//
// IDW_TOOLBOX
//
this.IDW_TOOLBOX.Conflicted = false;
this.IDW_TOOLBOX.Location = new System.Drawing.Point(87, 190);
this.IDW_TOOLBOX.Name = "IDW_TOOLBOX";
this.IDW_TOOLBOX.Size = new System.Drawing.Size(100, 20);
@ -1885,6 +1969,7 @@
//
this.IDW_Cheats.AcceptsTab = true;
this.IDW_Cheats.BackColor = System.Drawing.SystemColors.Window;
this.IDW_Cheats.Conflicted = false;
this.IDW_Cheats.Location = new System.Drawing.Point(87, 138);
this.IDW_Cheats.Name = "IDW_Cheats";
this.IDW_Cheats.Size = new System.Drawing.Size(100, 20);
@ -1894,6 +1979,7 @@
//
this.IDW_LuaConsole.AcceptsTab = true;
this.IDW_LuaConsole.BackColor = System.Drawing.SystemColors.Window;
this.IDW_LuaConsole.Conflicted = false;
this.IDW_LuaConsole.Location = new System.Drawing.Point(87, 112);
this.IDW_LuaConsole.Name = "IDW_LuaConsole";
this.IDW_LuaConsole.Size = new System.Drawing.Size(100, 20);
@ -1903,6 +1989,7 @@
//
this.IDW_HexEditor.AcceptsTab = true;
this.IDW_HexEditor.BackColor = System.Drawing.SystemColors.Window;
this.IDW_HexEditor.Conflicted = false;
this.IDW_HexEditor.Location = new System.Drawing.Point(87, 88);
this.IDW_HexEditor.Name = "IDW_HexEditor";
this.IDW_HexEditor.Size = new System.Drawing.Size(100, 20);
@ -1912,6 +1999,7 @@
//
this.IDW_RamPoke.AcceptsTab = true;
this.IDW_RamPoke.BackColor = System.Drawing.SystemColors.Window;
this.IDW_RamPoke.Conflicted = false;
this.IDW_RamPoke.Location = new System.Drawing.Point(87, 63);
this.IDW_RamPoke.Name = "IDW_RamPoke";
this.IDW_RamPoke.Size = new System.Drawing.Size(100, 20);
@ -1921,6 +2009,7 @@
//
this.IDW_RamSearch.AcceptsTab = true;
this.IDW_RamSearch.BackColor = System.Drawing.SystemColors.Window;
this.IDW_RamSearch.Conflicted = false;
this.IDW_RamSearch.Location = new System.Drawing.Point(87, 38);
this.IDW_RamSearch.Name = "IDW_RamSearch";
this.IDW_RamSearch.Size = new System.Drawing.Size(100, 20);
@ -2028,6 +2117,7 @@
//
this.IDW_SNES_ToggleBG4.AcceptsTab = true;
this.IDW_SNES_ToggleBG4.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleBG4.Conflicted = false;
this.IDW_SNES_ToggleBG4.Location = new System.Drawing.Point(93, 82);
this.IDW_SNES_ToggleBG4.Name = "IDW_SNES_ToggleBG4";
this.IDW_SNES_ToggleBG4.Size = new System.Drawing.Size(100, 20);
@ -2037,6 +2127,7 @@
//
this.IDW_SNES_ToggleBG3.AcceptsTab = true;
this.IDW_SNES_ToggleBG3.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleBG3.Conflicted = false;
this.IDW_SNES_ToggleBG3.Location = new System.Drawing.Point(93, 58);
this.IDW_SNES_ToggleBG3.Name = "IDW_SNES_ToggleBG3";
this.IDW_SNES_ToggleBG3.Size = new System.Drawing.Size(100, 20);
@ -2046,6 +2137,7 @@
//
this.IDW_SNES_ToggleBG2.AcceptsTab = true;
this.IDW_SNES_ToggleBG2.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleBG2.Conflicted = false;
this.IDW_SNES_ToggleBG2.Location = new System.Drawing.Point(93, 34);
this.IDW_SNES_ToggleBG2.Name = "IDW_SNES_ToggleBG2";
this.IDW_SNES_ToggleBG2.Size = new System.Drawing.Size(100, 20);
@ -2055,6 +2147,7 @@
//
this.IDW_SNES_ToggleBG1.AcceptsTab = true;
this.IDW_SNES_ToggleBG1.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleBG1.Conflicted = false;
this.IDW_SNES_ToggleBG1.Location = new System.Drawing.Point(93, 10);
this.IDW_SNES_ToggleBG1.Name = "IDW_SNES_ToggleBG1";
this.IDW_SNES_ToggleBG1.Size = new System.Drawing.Size(100, 20);
@ -2064,6 +2157,7 @@
//
this.IDW_SNES_ToggleOBJ4.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ4.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ4.Conflicted = false;
this.IDW_SNES_ToggleOBJ4.Location = new System.Drawing.Point(93, 178);
this.IDW_SNES_ToggleOBJ4.Name = "IDW_SNES_ToggleOBJ4";
this.IDW_SNES_ToggleOBJ4.Size = new System.Drawing.Size(100, 20);
@ -2073,6 +2167,7 @@
//
this.IDW_SNES_ToggleOBJ3.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ3.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ3.Conflicted = false;
this.IDW_SNES_ToggleOBJ3.Location = new System.Drawing.Point(93, 154);
this.IDW_SNES_ToggleOBJ3.Name = "IDW_SNES_ToggleOBJ3";
this.IDW_SNES_ToggleOBJ3.Size = new System.Drawing.Size(100, 20);
@ -2082,6 +2177,7 @@
//
this.IDW_SNES_ToggleOBJ2.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ2.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ2.Conflicted = false;
this.IDW_SNES_ToggleOBJ2.Location = new System.Drawing.Point(93, 130);
this.IDW_SNES_ToggleOBJ2.Name = "IDW_SNES_ToggleOBJ2";
this.IDW_SNES_ToggleOBJ2.Size = new System.Drawing.Size(100, 20);
@ -2091,6 +2187,7 @@
//
this.IDW_SNES_ToggleOBJ1.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ1.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ1.Conflicted = false;
this.IDW_SNES_ToggleOBJ1.Location = new System.Drawing.Point(93, 106);
this.IDW_SNES_ToggleOBJ1.Name = "IDW_SNES_ToggleOBJ1";
this.IDW_SNES_ToggleOBJ1.Size = new System.Drawing.Size(100, 20);
@ -2139,6 +2236,25 @@
this.AutoTabCheckBox.UseVisualStyleBackColor = true;
this.AutoTabCheckBox.CheckedChanged += new System.EventHandler(this.AutoTabCheckBox_CheckedChanged);
//
// label84
//
this.label84.AutoSize = true;
this.label84.Location = new System.Drawing.Point(402, 182);
this.label84.Name = "label84";
this.label84.Size = new System.Drawing.Size(43, 13);
this.label84.TabIndex = 118;
this.label84.Text = "Autofire";
//
// IDW_AutoholdAutofire
//
this.IDW_AutoholdAutofire.AcceptsTab = true;
this.IDW_AutoholdAutofire.BackColor = System.Drawing.SystemColors.Window;
this.IDW_AutoholdAutofire.Conflicted = false;
this.IDW_AutoholdAutofire.Location = new System.Drawing.Point(492, 178);
this.IDW_AutoholdAutofire.Name = "IDW_AutoholdAutofire";
this.IDW_AutoholdAutofire.Size = new System.Drawing.Size(100, 20);
this.IDW_AutoholdAutofire.TabIndex = 119;
//
// HotkeyWindow
//
this.AcceptButton = this.IDB_SAVE;
@ -2375,5 +2491,7 @@
private InputWidget IDW_SaveMovie;
private System.Windows.Forms.Label VirtualPadsLabel;
private InputWidget IDW_OpenVirtualPad;
private System.Windows.Forms.Label label84;
private InputWidget IDW_AutoholdAutofire;
}
}

View File

@ -103,6 +103,7 @@ namespace BizHawk.MultiClient
IDW_DecSpeed.SetBindings(Global.Config.DecreaseSpeedBinding);
IDW_ToggleBGInput.SetBindings(Global.Config.ToggleBackgroundInput);
IDW_Autohold.SetBindings(Global.Config.AutoholdBinding);
IDW_AutoholdAutofire.SetBindings(Global.Config.AutoholdAutofireBinding);
IDW_ClearAutohold.SetBindings(Global.Config.AutoholdClear);
IDW_SNES_ToggleBG1.SetBindings(Global.Config.ToggleSNESBG1Binding);
IDW_SNES_ToggleBG2.SetBindings(Global.Config.ToggleSNESBG2Binding);
@ -225,6 +226,7 @@ namespace BizHawk.MultiClient
Global.Config.ToggleBackgroundInput = IDW_ToggleBGInput.Text;
Global.Config.AutoholdBinding = IDW_Autohold.Text;
Global.Config.AutoholdAutofireBinding = IDW_AutoholdAutofire.Text;
Global.Config.AutoholdClear = IDW_ClearAutohold.Text;
Global.Config.ToggleSNESBG1Binding = IDW_SNES_ToggleBG1.Text;