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

oops, more files needed for N64 - add a menu item for "Mupen style lag"

This commit is contained in:
adelikat 2014-08-03 02:22:56 +00:00
parent 7fa58557a6
commit ed976055c2
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,6 +368,7 @@
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.MupenStyleLagMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MainformMenu.SuspendLayout(); this.MainformMenu.SuspendLayout();
this.MainStatusBar.SuspendLayout(); this.MainStatusBar.SuspendLayout();
this.MainFormContextMenu.SuspendLayout(); this.MainFormContextMenu.SuspendLayout();
@ -432,7 +433,7 @@
// //
this.OpenRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenRomMenuItem.Name = "OpenRomMenuItem"; this.OpenRomMenuItem.Name = "OpenRomMenuItem";
this.OpenRomMenuItem.Size = new System.Drawing.Size(140, 22); this.OpenRomMenuItem.Size = new System.Drawing.Size(152, 22);
this.OpenRomMenuItem.Text = "Open ROM"; this.OpenRomMenuItem.Text = "Open ROM";
this.OpenRomMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click); this.OpenRomMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click);
// //
@ -442,27 +443,27 @@
this.toolStripSeparator3}); this.toolStripSeparator3});
this.RecentRomSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentRomSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentRomSubMenu.Name = "RecentRomSubMenu"; this.RecentRomSubMenu.Name = "RecentRomSubMenu";
this.RecentRomSubMenu.Size = new System.Drawing.Size(140, 22); this.RecentRomSubMenu.Size = new System.Drawing.Size(152, 22);
this.RecentRomSubMenu.Text = "Recent ROM"; this.RecentRomSubMenu.Text = "Recent ROM";
this.RecentRomSubMenu.DropDownOpened += new System.EventHandler(this.RecentRomMenuItem_DropDownOpened); this.RecentRomSubMenu.DropDownOpened += new System.EventHandler(this.RecentRomMenuItem_DropDownOpened);
// //
// toolStripSeparator3 // toolStripSeparator3
// //
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6); this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
// //
// CloseRomMenuItem // CloseRomMenuItem
// //
this.CloseRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; this.CloseRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close;
this.CloseRomMenuItem.Name = "CloseRomMenuItem"; this.CloseRomMenuItem.Name = "CloseRomMenuItem";
this.CloseRomMenuItem.Size = new System.Drawing.Size(140, 22); this.CloseRomMenuItem.Size = new System.Drawing.Size(152, 22);
this.CloseRomMenuItem.Text = "&Close ROM"; this.CloseRomMenuItem.Text = "&Close ROM";
this.CloseRomMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click); this.CloseRomMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click);
// //
// toolStripMenuItem1 // toolStripMenuItem1
// //
this.toolStripMenuItem1.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(137, 6); this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
// //
// SaveStateSubMenu // SaveStateSubMenu
// //
@ -480,7 +481,7 @@
this.toolStripSeparator6, this.toolStripSeparator6,
this.SaveNamedStateMenuItem}); this.SaveNamedStateMenuItem});
this.SaveStateSubMenu.Name = "SaveStateSubMenu"; this.SaveStateSubMenu.Name = "SaveStateSubMenu";
this.SaveStateSubMenu.Size = new System.Drawing.Size(140, 22); this.SaveStateSubMenu.Size = new System.Drawing.Size(152, 22);
this.SaveStateSubMenu.Text = "Save State"; this.SaveStateSubMenu.Text = "Save State";
this.SaveStateSubMenu.DropDownOpened += new System.EventHandler(this.SaveStateSubMenu_DropDownOpened); this.SaveStateSubMenu.DropDownOpened += new System.EventHandler(this.SaveStateSubMenu_DropDownOpened);
// //
@ -584,7 +585,7 @@
this.toolStripSeparator21, this.toolStripSeparator21,
this.AutoloadLastSlotMenuItem}); this.AutoloadLastSlotMenuItem});
this.LoadStateSubMenu.Name = "LoadStateSubMenu"; this.LoadStateSubMenu.Name = "LoadStateSubMenu";
this.LoadStateSubMenu.Size = new System.Drawing.Size(140, 22); this.LoadStateSubMenu.Size = new System.Drawing.Size(152, 22);
this.LoadStateSubMenu.Text = "Load State"; this.LoadStateSubMenu.Text = "Load State";
this.LoadStateSubMenu.DropDownOpened += new System.EventHandler(this.LoadStateSubMenu_DropDownOpened); this.LoadStateSubMenu.DropDownOpened += new System.EventHandler(this.LoadStateSubMenu_DropDownOpened);
// //
@ -701,7 +702,7 @@
this.SaveToCurrentSlotMenuItem, this.SaveToCurrentSlotMenuItem,
this.LoadCurrentSlotMenuItem}); this.LoadCurrentSlotMenuItem});
this.SaveSlotSubMenu.Name = "SaveSlotSubMenu"; this.SaveSlotSubMenu.Name = "SaveSlotSubMenu";
this.SaveSlotSubMenu.Size = new System.Drawing.Size(140, 22); this.SaveSlotSubMenu.Size = new System.Drawing.Size(152, 22);
this.SaveSlotSubMenu.Text = "SaveSlot"; this.SaveSlotSubMenu.Text = "SaveSlot";
this.SaveSlotSubMenu.DropDownOpened += new System.EventHandler(this.SaveSlotSubMenu_DropDownOpened); this.SaveSlotSubMenu.DropDownOpened += new System.EventHandler(this.SaveSlotSubMenu_DropDownOpened);
// //
@ -813,7 +814,7 @@
// toolStripMenuItem2 // toolStripMenuItem2
// //
this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6); this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6);
// //
// MovieSubMenu // MovieSubMenu
// //
@ -833,7 +834,7 @@
this.FullMovieLoadstatesMenuItem, this.FullMovieLoadstatesMenuItem,
this.MovieEndSubMenu}); this.MovieEndSubMenu});
this.MovieSubMenu.Name = "MovieSubMenu"; this.MovieSubMenu.Name = "MovieSubMenu";
this.MovieSubMenu.Size = new System.Drawing.Size(140, 22); this.MovieSubMenu.Size = new System.Drawing.Size(152, 22);
this.MovieSubMenu.Text = "Movie"; this.MovieSubMenu.Text = "Movie";
this.MovieSubMenu.DropDownOpened += new System.EventHandler(this.MovieSubMenu_DropDownOpened); this.MovieSubMenu.DropDownOpened += new System.EventHandler(this.MovieSubMenu_DropDownOpened);
// //
@ -989,7 +990,7 @@
this.CaptureOSDMenuItem, this.CaptureOSDMenuItem,
this.SynclessRecordingMenuItem}); this.SynclessRecordingMenuItem});
this.AVSubMenu.Name = "AVSubMenu"; this.AVSubMenu.Name = "AVSubMenu";
this.AVSubMenu.Size = new System.Drawing.Size(140, 22); this.AVSubMenu.Size = new System.Drawing.Size(152, 22);
this.AVSubMenu.Text = "AVI/WAV"; this.AVSubMenu.Text = "AVI/WAV";
this.AVSubMenu.DropDownOpened += new System.EventHandler(this.AVSubMenu_DropDownOpened); this.AVSubMenu.DropDownOpened += new System.EventHandler(this.AVSubMenu_DropDownOpened);
// //
@ -1038,7 +1039,7 @@
this.toolStripSeparator20, this.toolStripSeparator20,
this.ScreenshotCaptureOSDMenuItem1}); this.ScreenshotCaptureOSDMenuItem1});
this.ScreenshotSubMenu.Name = "ScreenshotSubMenu"; this.ScreenshotSubMenu.Name = "ScreenshotSubMenu";
this.ScreenshotSubMenu.Size = new System.Drawing.Size(140, 22); this.ScreenshotSubMenu.Size = new System.Drawing.Size(152, 22);
this.ScreenshotSubMenu.Text = "Screenshot"; this.ScreenshotSubMenu.Text = "Screenshot";
this.ScreenshotSubMenu.DropDownOpening += new System.EventHandler(this.ScreenshotSubMenu_DropDownOpening); this.ScreenshotSubMenu.DropDownOpening += new System.EventHandler(this.ScreenshotSubMenu_DropDownOpening);
// //
@ -1089,13 +1090,13 @@
// toolStripSeparator4 // toolStripSeparator4
// //
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(137, 6); this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
// //
// ExitMenuItem // ExitMenuItem
// //
this.ExitMenuItem.Name = "ExitMenuItem"; this.ExitMenuItem.Name = "ExitMenuItem";
this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
this.ExitMenuItem.Size = new System.Drawing.Size(140, 22); this.ExitMenuItem.Size = new System.Drawing.Size(152, 22);
this.ExitMenuItem.Text = "Exit"; this.ExitMenuItem.Text = "Exit";
this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
// //
@ -2487,7 +2488,8 @@
this.N64PluginSettingsMenuItem, this.N64PluginSettingsMenuItem,
this.N64ControllerSettingsMenuItem, this.N64ControllerSettingsMenuItem,
this.toolStripSeparator23, this.toolStripSeparator23,
this.N64CircularAnalogRangeMenuItem}); this.N64CircularAnalogRangeMenuItem,
this.MupenStyleLagMenuItem});
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";
@ -3233,6 +3235,13 @@
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);
// //
// MupenStyleLagMenuItem
//
this.MupenStyleLagMenuItem.Name = "MupenStyleLagMenuItem";
this.MupenStyleLagMenuItem.Size = new System.Drawing.Size(192, 22);
this.MupenStyleLagMenuItem.Text = "&Mupen style Lag";
this.MupenStyleLagMenuItem.Click += new System.EventHandler(this.MupenStyleLagMenuItem_Click);
//
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
@ -3612,6 +3621,7 @@
private System.Windows.Forms.ToolStripMenuItem MovieEndPauseMenuItem; private System.Windows.Forms.ToolStripMenuItem MovieEndPauseMenuItem;
private System.Windows.Forms.ToolStripMenuItem ScreenshotClientClipboardMenuItem; private System.Windows.Forms.ToolStripMenuItem ScreenshotClientClipboardMenuItem;
private System.Windows.Forms.ToolStripMenuItem SnesWithSnes9xMenuItem; private System.Windows.Forms.ToolStripMenuItem SnesWithSnes9xMenuItem;
private System.Windows.Forms.ToolStripMenuItem MupenStyleLagMenuItem;
} }
} }

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

@ -9,6 +9,7 @@ using BizHawk.Emulation.Cores.Calculators;
using BizHawk.Emulation.Cores.ColecoVision; using BizHawk.Emulation.Cores.ColecoVision;
using BizHawk.Emulation.Cores.Nintendo.Gameboy; using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.NES; using BizHawk.Emulation.Cores.Nintendo.NES;
using BizHawk.Emulation.Cores.Nintendo.N64;
using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.Nintendo.SNES;
using BizHawk.Emulation.Cores.PCEngine; using BizHawk.Emulation.Cores.PCEngine;
using BizHawk.Emulation.Cores.Sega.MasterSystem; using BizHawk.Emulation.Cores.Sega.MasterSystem;
@ -16,6 +17,7 @@ using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.config.NES; using BizHawk.Client.EmuHawk.config.NES;
using BizHawk.Client.EmuHawk.CustomControls; using BizHawk.Client.EmuHawk.CustomControls;
using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Client.EmuHawk.WinFormExtensions;
using BizHawk.Client.EmuHawk.ToolExtensions; using BizHawk.Client.EmuHawk.ToolExtensions;
@ -1784,6 +1786,9 @@ namespace BizHawk.Client.EmuHawk
!Global.MovieSession.Movie.IsActive; !Global.MovieSession.Movie.IsActive;
N64CircularAnalogRangeMenuItem.Checked = Global.Config.N64UseCircularAnalogConstraint; N64CircularAnalogRangeMenuItem.Checked = Global.Config.N64UseCircularAnalogConstraint;
var ss = (N64SyncSettings)Global.Emulator.GetSyncSettings();
MupenStyleLagMenuItem.Checked = ss.UseMupenStyleLag;
} }
private void N64PluginSettingsMenuItem_Click(object sender, EventArgs e) private void N64PluginSettingsMenuItem_Click(object sender, EventArgs e)
@ -1824,6 +1829,13 @@ namespace BizHawk.Client.EmuHawk
Global.Config.N64UseCircularAnalogConstraint ^= true; Global.Config.N64UseCircularAnalogConstraint ^= true;
} }
private void MupenStyleLagMenuItem_Click(object sender, EventArgs e)
{
var ss = (N64SyncSettings)Global.Emulator.GetSyncSettings();
ss.UseMupenStyleLag ^= true;
Global.Emulator.PutSyncSettings(ss);
}
#endregion #endregion
#region Saturn #region Saturn