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

Re-add the Skip Lag Frames menu item, not sure when this got removed

This commit is contained in:
adelikat 2012-09-15 14:48:09 +00:00
parent 84cfa9c546
commit 2256ccc12b
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

@ -279,6 +279,7 @@
this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem();
this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem();
this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem();
this.frameAdvanceSkipLagFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.StatusSlot0.SuspendLayout(); this.StatusSlot0.SuspendLayout();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
@ -1216,7 +1217,7 @@
// //
this.controllersToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.controllersToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController;
this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem";
this.controllersToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.controllersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.controllersToolStripMenuItem.Text = "&Controllers..."; this.controllersToolStripMenuItem.Text = "&Controllers...";
this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click);
// //
@ -1224,7 +1225,7 @@
// //
this.hotkeysToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; this.hotkeysToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys;
this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem"; this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem";
this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.hotkeysToolStripMenuItem.Text = "&Hotkeys..."; this.hotkeysToolStripMenuItem.Text = "&Hotkeys...";
this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click);
// //
@ -1232,7 +1233,7 @@
// //
this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig;
this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem"; this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem";
this.messagesToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.messagesToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.messagesToolStripMenuItem.Text = "&Messages..."; this.messagesToolStripMenuItem.Text = "&Messages...";
this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click); this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click);
// //
@ -1240,7 +1241,7 @@
// //
this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS;
this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem"; this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem";
this.pathsToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.pathsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.pathsToolStripMenuItem.Text = "Paths..."; this.pathsToolStripMenuItem.Text = "Paths...";
this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click); this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click);
// //
@ -1248,7 +1249,7 @@
// //
this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS;
this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; this.soundToolStripMenuItem.Name = "soundToolStripMenuItem";
this.soundToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.soundToolStripMenuItem.Text = "&Sound..."; this.soundToolStripMenuItem.Text = "&Sound...";
this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click);
// //
@ -1256,14 +1257,14 @@
// //
this.autofireToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; this.autofireToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning;
this.autofireToolStripMenuItem.Name = "autofireToolStripMenuItem"; this.autofireToolStripMenuItem.Name = "autofireToolStripMenuItem";
this.autofireToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.autofireToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.autofireToolStripMenuItem.Text = "&Autofire..."; this.autofireToolStripMenuItem.Text = "&Autofire...";
this.autofireToolStripMenuItem.Click += new System.EventHandler(this.autofireToolStripMenuItem_Click); this.autofireToolStripMenuItem.Click += new System.EventHandler(this.autofireToolStripMenuItem_Click);
// //
// toolStripSeparator9 // toolStripSeparator9
// //
this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(138, 6); this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6);
// //
// enableToolStripMenuItem // enableToolStripMenuItem
// //
@ -1272,44 +1273,45 @@
this.enableContextMenuToolStripMenuItem, this.enableContextMenuToolStripMenuItem,
this.backupSavestatesToolStripMenuItem, this.backupSavestatesToolStripMenuItem,
this.autoSavestatesToolStripMenuItem, this.autoSavestatesToolStripMenuItem,
this.saveScreenshotWithSavestatesToolStripMenuItem}); this.saveScreenshotWithSavestatesToolStripMenuItem,
this.frameAdvanceSkipLagFramesToolStripMenuItem});
this.enableToolStripMenuItem.Name = "enableToolStripMenuItem"; this.enableToolStripMenuItem.Name = "enableToolStripMenuItem";
this.enableToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.enableToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.enableToolStripMenuItem.Text = "&Enable"; this.enableToolStripMenuItem.Text = "&Enable";
this.enableToolStripMenuItem.DropDownOpened += new System.EventHandler(this.enableToolStripMenuItem_DropDownOpened); this.enableToolStripMenuItem.DropDownOpened += new System.EventHandler(this.enableToolStripMenuItem_DropDownOpened);
// //
// enableRewindToolStripMenuItem // enableRewindToolStripMenuItem
// //
this.enableRewindToolStripMenuItem.Name = "enableRewindToolStripMenuItem"; this.enableRewindToolStripMenuItem.Name = "enableRewindToolStripMenuItem";
this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
this.enableRewindToolStripMenuItem.Text = "&Enable Rewind"; this.enableRewindToolStripMenuItem.Text = "&Enable Rewind";
this.enableRewindToolStripMenuItem.Click += new System.EventHandler(this.enableRewindToolStripMenuItem_Click); this.enableRewindToolStripMenuItem.Click += new System.EventHandler(this.enableRewindToolStripMenuItem_Click);
// //
// enableContextMenuToolStripMenuItem // enableContextMenuToolStripMenuItem
// //
this.enableContextMenuToolStripMenuItem.Name = "enableContextMenuToolStripMenuItem"; this.enableContextMenuToolStripMenuItem.Name = "enableContextMenuToolStripMenuItem";
this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
this.enableContextMenuToolStripMenuItem.Text = "Enable Context Menu"; this.enableContextMenuToolStripMenuItem.Text = "Enable Context Menu";
this.enableContextMenuToolStripMenuItem.Click += new System.EventHandler(this.enableContextMenuToolStripMenuItem_Click); this.enableContextMenuToolStripMenuItem.Click += new System.EventHandler(this.enableContextMenuToolStripMenuItem_Click);
// //
// backupSavestatesToolStripMenuItem // backupSavestatesToolStripMenuItem
// //
this.backupSavestatesToolStripMenuItem.Name = "backupSavestatesToolStripMenuItem"; this.backupSavestatesToolStripMenuItem.Name = "backupSavestatesToolStripMenuItem";
this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
this.backupSavestatesToolStripMenuItem.Text = "Backup Savestates"; this.backupSavestatesToolStripMenuItem.Text = "Backup Savestates";
this.backupSavestatesToolStripMenuItem.Click += new System.EventHandler(this.backupSavestatesToolStripMenuItem_Click); this.backupSavestatesToolStripMenuItem.Click += new System.EventHandler(this.backupSavestatesToolStripMenuItem_Click);
// //
// autoSavestatesToolStripMenuItem // autoSavestatesToolStripMenuItem
// //
this.autoSavestatesToolStripMenuItem.Name = "autoSavestatesToolStripMenuItem"; this.autoSavestatesToolStripMenuItem.Name = "autoSavestatesToolStripMenuItem";
this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
this.autoSavestatesToolStripMenuItem.Text = "Auto Savestates"; this.autoSavestatesToolStripMenuItem.Text = "Auto Savestates";
this.autoSavestatesToolStripMenuItem.Click += new System.EventHandler(this.autoSavestatesToolStripMenuItem_Click); this.autoSavestatesToolStripMenuItem.Click += new System.EventHandler(this.autoSavestatesToolStripMenuItem_Click);
// //
// saveScreenshotWithSavestatesToolStripMenuItem // saveScreenshotWithSavestatesToolStripMenuItem
// //
this.saveScreenshotWithSavestatesToolStripMenuItem.Name = "saveScreenshotWithSavestatesToolStripMenuItem"; this.saveScreenshotWithSavestatesToolStripMenuItem.Name = "saveScreenshotWithSavestatesToolStripMenuItem";
this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(242, 22); this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
this.saveScreenshotWithSavestatesToolStripMenuItem.Text = "Save Screenshot with Savestates"; this.saveScreenshotWithSavestatesToolStripMenuItem.Text = "Save Screenshot with Savestates";
this.saveScreenshotWithSavestatesToolStripMenuItem.Click += new System.EventHandler(this.screenshotWithSavestatesToolStripMenuItem_Click); this.saveScreenshotWithSavestatesToolStripMenuItem.Click += new System.EventHandler(this.screenshotWithSavestatesToolStripMenuItem_Click);
// //
@ -1330,7 +1332,7 @@
this.toolStripSeparator23, this.toolStripSeparator23,
this.logWindowAsConsoleToolStripMenuItem}); this.logWindowAsConsoleToolStripMenuItem});
this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem";
this.gUIToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.gUIToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.gUIToolStripMenuItem.Text = "GUI"; this.gUIToolStripMenuItem.Text = "GUI";
this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened);
// //
@ -1445,7 +1447,7 @@
this.miSpeed150, this.miSpeed150,
this.miSpeed200}); this.miSpeed200});
this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem"; this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem";
this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.frameSkipToolStripMenuItem.Text = "Speed/Skip"; this.frameSkipToolStripMenuItem.Text = "Speed/Skip";
this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened); this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened);
// //
@ -1588,13 +1590,13 @@
// toolStripSeparator10 // toolStripSeparator10
// //
this.toolStripSeparator10.Name = "toolStripSeparator10"; this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(138, 6); this.toolStripSeparator10.Size = new System.Drawing.Size(149, 6);
// //
// saveConfigToolStripMenuItem // saveConfigToolStripMenuItem
// //
this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save; this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save;
this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem";
this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.saveConfigToolStripMenuItem.Text = "Save Config"; this.saveConfigToolStripMenuItem.Text = "Save Config";
this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click);
// //
@ -1602,7 +1604,7 @@
// //
this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig;
this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem";
this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(141, 22); this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.loadConfigToolStripMenuItem.Text = "Load Config"; this.loadConfigToolStripMenuItem.Text = "Load Config";
// //
// toolsToolStripMenuItem // toolsToolStripMenuItem
@ -2401,6 +2403,13 @@
this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Text = "Show Menu";
this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click);
// //
// frameAdvanceSkipLagFramesToolStripMenuItem
//
this.frameAdvanceSkipLagFramesToolStripMenuItem.Name = "frameAdvanceSkipLagFramesToolStripMenuItem";
this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
this.frameAdvanceSkipLagFramesToolStripMenuItem.Text = "Frame Advance - Skip Lag Frames";
this.frameAdvanceSkipLagFramesToolStripMenuItem.Click += new System.EventHandler(this.frameAdvanceSkipLagFramesToolStripMenuItem_Click);
//
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
@ -2692,6 +2701,7 @@
private System.Windows.Forms.ToolStripMenuItem oBJ2ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem oBJ2ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem oBJ3ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem oBJ3ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem changeDMGPalettesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem changeDMGPalettesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem frameAdvanceSkipLagFramesToolStripMenuItem;
} }
} }

1
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -1290,6 +1290,7 @@ namespace BizHawk.MultiClient
backupSavestatesToolStripMenuItem.Checked = Global.Config.BackupSavestates; backupSavestatesToolStripMenuItem.Checked = Global.Config.BackupSavestates;
autoSavestatesToolStripMenuItem.Checked = Global.Config.AutoSavestates; autoSavestatesToolStripMenuItem.Checked = Global.Config.AutoSavestates;
saveScreenshotWithSavestatesToolStripMenuItem.Checked = Global.Config.SaveScreenshotWithStates; saveScreenshotWithSavestatesToolStripMenuItem.Checked = Global.Config.SaveScreenshotWithStates;
frameAdvanceSkipLagFramesToolStripMenuItem.Checked = Global.Config.SkipLagFrame;
} }
private void frameAdvanceSkipLagFramesToolStripMenuItem_Click(object sender, EventArgs e) private void frameAdvanceSkipLagFramesToolStripMenuItem_Click(object sender, EventArgs e)