ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

N64 menu item for "Use Circular Analog Range"

This commit is contained in:
adelikat 2014-05-17 20:18:29 +00:00
parent 4fa6b94c1d
commit 412b35fe51
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -199,9 +199,10 @@
this.NESGameGenieCodesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NESGameGenieCodesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
this.NesControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NesControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MovieSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NESGraphicSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NESGraphicSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NESSoundChannelsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NESSoundChannelsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MovieSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
this.FDSControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.FDSControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.FdsEjectDiskMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.FdsEjectDiskMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PCESubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.PCESubMenu = new System.Windows.Forms.ToolStripMenuItem();
@ -353,7 +354,8 @@
this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator(); this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator();
this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator();
this.N64CircularAnalogRangeMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MainformMenu.SuspendLayout(); this.MainformMenu.SuspendLayout();
this.MainStatusBar.SuspendLayout(); this.MainStatusBar.SuspendLayout();
this.MainFormContextMenu.SuspendLayout(); this.MainFormContextMenu.SuspendLayout();
@ -385,7 +387,7 @@
this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
this.MainformMenu.Location = new System.Drawing.Point(0, 0); this.MainformMenu.Location = new System.Drawing.Point(0, 0);
this.MainformMenu.Name = "MainformMenu"; this.MainformMenu.Name = "MainformMenu";
this.MainformMenu.Size = new System.Drawing.Size(470, 42); this.MainformMenu.Size = new System.Drawing.Size(470, 61);
this.MainformMenu.TabIndex = 0; this.MainformMenu.TabIndex = 0;
this.MainformMenu.Text = "menuStrip1"; this.MainformMenu.Text = "menuStrip1";
this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate); this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate);
@ -1837,13 +1839,6 @@
this.NesControllerSettingsMenuItem.Text = "Controller Settings..."; this.NesControllerSettingsMenuItem.Text = "Controller Settings...";
this.NesControllerSettingsMenuItem.Click += new System.EventHandler(this.NesControllerSettingsMenuItem_Click); this.NesControllerSettingsMenuItem.Click += new System.EventHandler(this.NesControllerSettingsMenuItem_Click);
// //
// MovieSettingsMenuItem
//
this.MovieSettingsMenuItem.Name = "MovieSettingsMenuItem";
this.MovieSettingsMenuItem.Size = new System.Drawing.Size(233, 22);
this.MovieSettingsMenuItem.Text = "Advanced Movie Settings...";
this.MovieSettingsMenuItem.Click += new System.EventHandler(this.MovieSettingsMenuItem_Click);
//
// NESGraphicSettingsMenuItem // NESGraphicSettingsMenuItem
// //
this.NESGraphicSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon; this.NESGraphicSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon;
@ -1860,6 +1855,18 @@
this.NESSoundChannelsMenuItem.Text = "Sound Channels..."; this.NESSoundChannelsMenuItem.Text = "Sound Channels...";
this.NESSoundChannelsMenuItem.Click += new System.EventHandler(this.NESSoundChannelsMenuItem_Click); this.NESSoundChannelsMenuItem.Click += new System.EventHandler(this.NESSoundChannelsMenuItem_Click);
// //
// MovieSettingsMenuItem
//
this.MovieSettingsMenuItem.Name = "MovieSettingsMenuItem";
this.MovieSettingsMenuItem.Size = new System.Drawing.Size(233, 22);
this.MovieSettingsMenuItem.Text = "Advanced Movie Settings...";
this.MovieSettingsMenuItem.Click += new System.EventHandler(this.MovieSettingsMenuItem_Click);
//
// toolStripSeparator22
//
this.toolStripSeparator22.Name = "toolStripSeparator22";
this.toolStripSeparator22.Size = new System.Drawing.Size(230, 6);
//
// FDSControlsMenuItem // FDSControlsMenuItem
// //
this.FDSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FDSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -2390,7 +2397,9 @@
// //
this.N64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.N64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.N64PluginSettingsMenuItem, this.N64PluginSettingsMenuItem,
this.N64ControllerSettingsMenuItem}); this.N64ControllerSettingsMenuItem,
this.toolStripSeparator23,
this.N64CircularAnalogRangeMenuItem});
this.N64SubMenu.Name = "N64SubMenu"; this.N64SubMenu.Name = "N64SubMenu";
this.N64SubMenu.Size = new System.Drawing.Size(40, 19); this.N64SubMenu.Size = new System.Drawing.Size(40, 19);
this.N64SubMenu.Text = "N64"; this.N64SubMenu.Text = "N64";
@ -2400,7 +2409,7 @@
// //
this.N64PluginSettingsMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("N64PluginSettingsMenuItem.Image"))); this.N64PluginSettingsMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("N64PluginSettingsMenuItem.Image")));
this.N64PluginSettingsMenuItem.Name = "N64PluginSettingsMenuItem"; this.N64PluginSettingsMenuItem.Name = "N64PluginSettingsMenuItem";
this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(181, 22); this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(192, 22);
this.N64PluginSettingsMenuItem.Text = "Plugins"; this.N64PluginSettingsMenuItem.Text = "Plugins";
this.N64PluginSettingsMenuItem.Click += new System.EventHandler(this.N64PluginSettingsMenuItem_Click); this.N64PluginSettingsMenuItem.Click += new System.EventHandler(this.N64PluginSettingsMenuItem_Click);
// //
@ -2408,7 +2417,7 @@
// //
this.N64ControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.N64ControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
this.N64ControllerSettingsMenuItem.Name = "N64ControllerSettingsMenuItem"; this.N64ControllerSettingsMenuItem.Name = "N64ControllerSettingsMenuItem";
this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(181, 22); this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(192, 22);
this.N64ControllerSettingsMenuItem.Text = "Controller Settings..."; this.N64ControllerSettingsMenuItem.Text = "Controller Settings...";
this.N64ControllerSettingsMenuItem.Click += new System.EventHandler(this.N64ControllerSettingsMenuItem_Click); this.N64ControllerSettingsMenuItem.Click += new System.EventHandler(this.N64ControllerSettingsMenuItem_Click);
// //
@ -2507,6 +2516,7 @@
// //
// MainStatusBar // MainStatusBar
// //
this.MainStatusBar.ClickThrough = true;
this.MainStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MainStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.DumpStatusButton, this.DumpStatusButton,
this.EmuStatus, this.EmuStatus,
@ -3091,10 +3101,17 @@
this.ShowMenuContextMenuItem.Text = "Show Menu"; this.ShowMenuContextMenuItem.Text = "Show Menu";
this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click); this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click);
// //
// toolStripSeparator22 // toolStripSeparator23
// //
this.toolStripSeparator22.Name = "toolStripSeparator22"; this.toolStripSeparator23.Name = "toolStripSeparator23";
this.toolStripSeparator22.Size = new System.Drawing.Size(230, 6); this.toolStripSeparator23.Size = new System.Drawing.Size(189, 6);
//
// N64CircularAnalogRangeMenuItem
//
this.N64CircularAnalogRangeMenuItem.Name = "N64CircularAnalogRangeMenuItem";
this.N64CircularAnalogRangeMenuItem.Size = new System.Drawing.Size(192, 22);
this.N64CircularAnalogRangeMenuItem.Text = "Circular Analog Range";
this.N64CircularAnalogRangeMenuItem.Click += new System.EventHandler(this.N64CircularAnalogRangeMenuItem_Click);
// //
// MainForm // MainForm
// //
@ -3461,6 +3478,8 @@
private System.Windows.Forms.ToolStripMenuItem GBcoreSettingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem GBcoreSettingsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem NesControllerSettingsMenuItem; private System.Windows.Forms.ToolStripMenuItem NesControllerSettingsMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator22; private System.Windows.Forms.ToolStripSeparator toolStripSeparator22;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator23;
private System.Windows.Forms.ToolStripMenuItem N64CircularAnalogRangeMenuItem;
} }
} }

7
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1632,6 +1632,8 @@ namespace BizHawk.Client.EmuHawk
N64PluginSettingsMenuItem.Enabled = N64PluginSettingsMenuItem.Enabled =
N64ControllerSettingsMenuItem.Enabled = N64ControllerSettingsMenuItem.Enabled =
!Global.MovieSession.Movie.IsActive; !Global.MovieSession.Movie.IsActive;
N64CircularAnalogRangeMenuItem.Checked = Global.Config.N64UseCircularAnalogConstraint;
} }
private void N64PluginSettingsMenuItem_Click(object sender, EventArgs e) private void N64PluginSettingsMenuItem_Click(object sender, EventArgs e)
@ -1660,6 +1662,11 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void N64CircularAnalogRangeMenuItem_Click(object sender, EventArgs e)
{
Global.Config.N64UseCircularAnalogConstraint ^= true;
}
#endregion #endregion
#region Saturn #region Saturn