From 7cfd6f32b0233857eb6245bce3d0239c47f44f73 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 4 Aug 2013 18:36:33 +0000 Subject: [PATCH] Fix a bunch of hotkey regressions --- .../DisplayManager/DisplayManager.cs | 2 +- BizHawk.MultiClient/MainForm.cs | 14 +++++++------- .../config/NewHotkeyWindow.Designer.cs | 14 +++++++------- BizHawk.MultiClient/config/NewHotkeyWindow.cs | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs index 5a9f98468f..a6b8f3d699 100644 --- a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs +++ b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs @@ -580,7 +580,7 @@ namespace BizHawk.MultiClient g.DrawString(rerec, MessageFont, FixedMessagesColor, x, y); } - if (Global.ClientControls["Autohold"] || Global.ClientControls["AutoholdAutofire"]) + if (Global.ClientControls["Autohold"] || Global.ClientControls["Autofire"]) { StringBuilder disp = new StringBuilder("Held: "); diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 1064da595b..cb47fd23b7 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -571,7 +571,7 @@ namespace BizHawk.MultiClient Global.StickyXORAdapter.MassToggleStickyState(Global.ActiveController.PressedButtons); Global.AutofireStickyXORAdapter.MassToggleStickyState(Global.AutoFireController.PressedButtons); } - else if (Global.ClientControls["AutoholdAutofire"]) + else if (Global.ClientControls["Autofire"]) { Global.AutofireStickyXORAdapter.MassToggleStickyState(Global.ActiveController.PressedButtons); } @@ -1868,7 +1868,7 @@ namespace BizHawk.MultiClient break; case "Clear Autohold": ClearAutohold(); break; case "Screenshot": TakeScreenshot(); break; - case "Toggle Fullscreen": ToggleFullscreen(); break; + case "Full Screen": ToggleFullscreen(); break; case "Open ROM": OpenROM(); break; case "Close ROM": CloseROM(); break; case "Display FPS": ToggleFPS(); break; @@ -1999,7 +1999,7 @@ namespace BizHawk.MultiClient case "Hex Editor": LoadHexEditor(); break; case "Lua Console": OpenLuaConsole(); break; case "Cheats": LoadCheatsWindow(); break; - case "TASTudio": LoadTAStudio(); break; + case "TAStudio": LoadTAStudio(); break; case "ToolBox": LoadToolBox(); break; case "Virtual Pad": LoadVirtualPads(); break; @@ -2011,9 +2011,9 @@ namespace BizHawk.MultiClient case "Toggle OBJ 2": SNES_ToggleOBJ2(); break; case "Toggle OBJ 3": SNES_ToggleOBJ3(); break; case "Toggle OBJ 4": SNES_ToggleOBJ4(); break; - - case "Y Up Large Binding": + + case "Y Up Large": VirtualPadForm1.BumpAnalogValue(null, Global.Config.Analog_LargeChange); break; } @@ -2114,8 +2114,8 @@ namespace BizHawk.MultiClient bool coreskipaudio = false; if (runFrame) { - bool ff = Global.ClientControls["Fast Forward"] || Global.ClientControls["MaxTurbo"]; - bool fff = Global.ClientControls["MaxTurbo"]; + bool ff = Global.ClientControls["Fast Forward"] || Global.ClientControls["Turbo"]; + bool fff = Global.ClientControls["Turbo"]; bool updateFpsString = (runloop_last_ff != ff); runloop_last_ff = ff; diff --git a/BizHawk.MultiClient/config/NewHotkeyWindow.Designer.cs b/BizHawk.MultiClient/config/NewHotkeyWindow.Designer.cs index 001d93e6dd..ccbef1570b 100644 --- a/BizHawk.MultiClient/config/NewHotkeyWindow.Designer.cs +++ b/BizHawk.MultiClient/config/NewHotkeyWindow.Designer.cs @@ -53,7 +53,7 @@ // this.AutoTabCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.AutoTabCheckBox.AutoSize = true; - this.AutoTabCheckBox.Location = new System.Drawing.Point(409, 422); + this.AutoTabCheckBox.Location = new System.Drawing.Point(453, 422); this.AutoTabCheckBox.Name = "AutoTabCheckBox"; this.AutoTabCheckBox.Size = new System.Drawing.Size(70, 17); this.AutoTabCheckBox.TabIndex = 101; @@ -70,7 +70,7 @@ this.HotkeyTabControl.Location = new System.Drawing.Point(12, 12); this.HotkeyTabControl.Name = "HotkeyTabControl"; this.HotkeyTabControl.SelectedIndex = 0; - this.HotkeyTabControl.Size = new System.Drawing.Size(685, 394); + this.HotkeyTabControl.Size = new System.Drawing.Size(729, 394); this.HotkeyTabControl.TabIndex = 102; // // tabPage1 @@ -78,7 +78,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(677, 368); + this.tabPage1.Size = new System.Drawing.Size(721, 368); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "For designer"; this.tabPage1.UseVisualStyleBackColor = true; @@ -87,7 +87,7 @@ // this.IDB_CANCEL.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.IDB_CANCEL.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.IDB_CANCEL.Location = new System.Drawing.Point(637, 418); + this.IDB_CANCEL.Location = new System.Drawing.Point(681, 418); this.IDB_CANCEL.Name = "IDB_CANCEL"; this.IDB_CANCEL.Size = new System.Drawing.Size(60, 22); this.IDB_CANCEL.TabIndex = 103; @@ -99,7 +99,7 @@ // IDB_SAVE // this.IDB_SAVE.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.IDB_SAVE.Location = new System.Drawing.Point(571, 418); + this.IDB_SAVE.Location = new System.Drawing.Point(615, 418); this.IDB_SAVE.Name = "IDB_SAVE"; this.IDB_SAVE.Size = new System.Drawing.Size(60, 22); this.IDB_SAVE.TabIndex = 104; @@ -111,7 +111,7 @@ // RestoreDefaults // this.RestoreDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.RestoreDefaults.Location = new System.Drawing.Point(485, 418); + this.RestoreDefaults.Location = new System.Drawing.Point(529, 418); this.RestoreDefaults.Name = "RestoreDefaults"; this.RestoreDefaults.Size = new System.Drawing.Size(60, 22); this.RestoreDefaults.TabIndex = 105; @@ -126,7 +126,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.IDB_CANCEL; - this.ClientSize = new System.Drawing.Size(709, 445); + this.ClientSize = new System.Drawing.Size(753, 445); this.Controls.Add(this.RestoreDefaults); this.Controls.Add(this.IDB_SAVE); this.Controls.Add(this.IDB_CANCEL); diff --git a/BizHawk.MultiClient/config/NewHotkeyWindow.cs b/BizHawk.MultiClient/config/NewHotkeyWindow.cs index 5df4c495b2..bdaeedc865 100644 --- a/BizHawk.MultiClient/config/NewHotkeyWindow.cs +++ b/BizHawk.MultiClient/config/NewHotkeyWindow.cs @@ -92,7 +92,7 @@ namespace BizHawk.MultiClient int _x = 6; int _y = 14; - int iw_offset_x = 87; + int iw_offset_x = 110; int iw_offset_y = -4; int iw_width = 120; foreach (Binding b in bindings)