diff --git a/BizHawk.Client.Common/CoreFileProvider.cs b/BizHawk.Client.Common/CoreFileProvider.cs index 1bfc79ab62..2a8c3ac355 100644 --- a/BizHawk.Client.Common/CoreFileProvider.cs +++ b/BizHawk.Client.Common/CoreFileProvider.cs @@ -127,13 +127,13 @@ namespace BizHawk.Client.Common //target.GG_HighlightActiveDisplayRegion = Global.Config.GGHighlightActiveDisplayRegion; //target.GG_ShowClippedRegions = Global.Config.GGShowClippedRegions; - target.Atari2600_ShowBG = Global.Config.Atari2600_ShowBG; - target.Atari2600_ShowPlayer1 = Global.Config.Atari2600_ShowPlayer1; - target.Atari2600_ShowPlayer2 = Global.Config.Atari2600_ShowPlayer2; - target.Atari2600_ShowMissle1 = Global.Config.Atari2600_ShowMissle1; - target.Atari2600_ShowMissle2 = Global.Config.Atari2600_ShowMissle2; - target.Atari2600_ShowBall = Global.Config.Atari2600_ShowBall; - target.Atari2600_ShowPF = Global.Config.Atari2600_ShowPlayfield; + //target.Atari2600_ShowBG = Global.Config.Atari2600_ShowBG; + //target.Atari2600_ShowPlayer1 = Global.Config.Atari2600_ShowPlayer1; + //target.Atari2600_ShowPlayer2 = Global.Config.Atari2600_ShowPlayer2; + //target.Atari2600_ShowMissle1 = Global.Config.Atari2600_ShowMissle1; + //target.Atari2600_ShowMissle2 = Global.Config.Atari2600_ShowMissle2; + //target.Atari2600_ShowBall = Global.Config.Atari2600_ShowBall; + //target.Atari2600_ShowPF = Global.Config.Atari2600_ShowPlayfield; } } } \ No newline at end of file diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs index 636d78f96f..601aae4f01 100644 --- a/BizHawk.Client.Common/config/Config.cs +++ b/BizHawk.Client.Common/config/Config.cs @@ -648,9 +648,9 @@ namespace BizHawk.Client.Common // Genesis Settings //Atari 2600 Settings - public bool Atari2600_BW = false; - public bool Atari2600_LeftDifficulty = true; - public bool Atari2600_RightDifficulty = true; + //public bool Atari2600_BW = false; + //public bool Atari2600_LeftDifficulty = true; + //public bool Atari2600_RightDifficulty = true; //Atari 7800 Settings @@ -714,13 +714,13 @@ namespace BizHawk.Client.Common public bool LuaWriterStartEmpty = false; //Atari 2600 Settings - public bool Atari2600_ShowBG = true; - public bool Atari2600_ShowPlayer1 = true; - public bool Atari2600_ShowPlayer2 = true; - public bool Atari2600_ShowMissle1 = true; - public bool Atari2600_ShowMissle2 = true; - public bool Atari2600_ShowBall = true; - public bool Atari2600_ShowPlayfield = true; + //public bool Atari2600_ShowBG = true; + //public bool Atari2600_ShowPlayer1 = true; + //public bool Atari2600_ShowPlayer2 = true; + //public bool Atari2600_ShowMissle1 = true; + //public bool Atari2600_ShowMissle2 = true; + //public bool Atari2600_ShowBall = true; + //public bool Atari2600_ShowPlayfield = true; } #region Sub-classes TODO - it is about time to port these to separate files diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs index c69e46def5..787bff434f 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -248,17 +248,7 @@ this.AutoloadKeypadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LoadTIFileMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AtariSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.AtariBWMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AtariLeftDifficultyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AtariRightDifficultyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator26 = new System.Windows.Forms.ToolStripSeparator(); - this.AtariShowBGMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AtariShowPlayfieldMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShowPlayer1MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShowPlayer2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShowMissle1MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShowMissle2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShowBallMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AtariSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.GBSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.GBForceDMGMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.GBAInCGBModeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -2214,96 +2204,17 @@ // AtariSubMenu // this.AtariSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.AtariBWMenuItem, - this.AtariLeftDifficultyMenuItem, - this.AtariRightDifficultyMenuItem, - this.toolStripSeparator26, - this.AtariShowBGMenuItem, - this.AtariShowPlayfieldMenuItem, - this.ShowPlayer1MenuItem, - this.ShowPlayer2MenuItem, - this.ShowMissle1MenuItem, - this.ShowMissle2MenuItem, - this.ShowBallMenuItem}); + this.AtariSettingsToolStripMenuItem}); this.AtariSubMenu.Name = "AtariSubMenu"; this.AtariSubMenu.Size = new System.Drawing.Size(42, 17); this.AtariSubMenu.Text = "&Atari"; - this.AtariSubMenu.DropDownOpened += new System.EventHandler(this.AtariSubMenu_DropDownOpened); // - // AtariBWMenuItem + // AtariSettingsToolStripMenuItem // - this.AtariBWMenuItem.Name = "AtariBWMenuItem"; - this.AtariBWMenuItem.Size = new System.Drawing.Size(144, 22); - this.AtariBWMenuItem.Text = "B-W TV"; - this.AtariBWMenuItem.Click += new System.EventHandler(this.AtariBWMenuItem_Click); - // - // AtariLeftDifficultyMenuItem - // - this.AtariLeftDifficultyMenuItem.Name = "AtariLeftDifficultyMenuItem"; - this.AtariLeftDifficultyMenuItem.Size = new System.Drawing.Size(144, 22); - this.AtariLeftDifficultyMenuItem.Text = "Left Difficulty"; - this.AtariLeftDifficultyMenuItem.Click += new System.EventHandler(this.AtariLeftDifficultyMenuItem_Click); - // - // AtariRightDifficultyMenuItem - // - this.AtariRightDifficultyMenuItem.Name = "AtariRightDifficultyMenuItem"; - this.AtariRightDifficultyMenuItem.Size = new System.Drawing.Size(144, 22); - this.AtariRightDifficultyMenuItem.Text = "Right Difficulty"; - this.AtariRightDifficultyMenuItem.Click += new System.EventHandler(this.AtariRightDifficultyMenuItem_Click); - // - // toolStripSeparator26 - // - this.toolStripSeparator26.Name = "toolStripSeparator26"; - this.toolStripSeparator26.Size = new System.Drawing.Size(141, 6); - // - // AtariShowBGMenuItem - // - this.AtariShowBGMenuItem.Name = "AtariShowBGMenuItem"; - this.AtariShowBGMenuItem.Size = new System.Drawing.Size(144, 22); - this.AtariShowBGMenuItem.Text = "Show BG"; - this.AtariShowBGMenuItem.Click += new System.EventHandler(this.AtariShowBGMenuItem_Click); - // - // AtariShowPlayfieldMenuItem - // - this.AtariShowPlayfieldMenuItem.Name = "AtariShowPlayfieldMenuItem"; - this.AtariShowPlayfieldMenuItem.Size = new System.Drawing.Size(144, 22); - this.AtariShowPlayfieldMenuItem.Text = "Show Playfield"; - this.AtariShowPlayfieldMenuItem.Click += new System.EventHandler(this.AtariShowPlayfieldMenuItem_Click); - // - // ShowPlayer1MenuItem - // - this.ShowPlayer1MenuItem.Name = "ShowPlayer1MenuItem"; - this.ShowPlayer1MenuItem.Size = new System.Drawing.Size(144, 22); - this.ShowPlayer1MenuItem.Text = "Show Player 1"; - this.ShowPlayer1MenuItem.Click += new System.EventHandler(this.ShowPlayer1MenuItem_Click); - // - // ShowPlayer2MenuItem - // - this.ShowPlayer2MenuItem.Name = "ShowPlayer2MenuItem"; - this.ShowPlayer2MenuItem.Size = new System.Drawing.Size(144, 22); - this.ShowPlayer2MenuItem.Text = "Show Player 2"; - this.ShowPlayer2MenuItem.Click += new System.EventHandler(this.ShowPlayer2MenuItem_Click); - // - // ShowMissle1MenuItem - // - this.ShowMissle1MenuItem.Name = "ShowMissle1MenuItem"; - this.ShowMissle1MenuItem.Size = new System.Drawing.Size(144, 22); - this.ShowMissle1MenuItem.Text = "Show Missle 1"; - this.ShowMissle1MenuItem.Click += new System.EventHandler(this.ShowMissle1MenuItem_Click); - // - // ShowMissle2MenuItem - // - this.ShowMissle2MenuItem.Name = "ShowMissle2MenuItem"; - this.ShowMissle2MenuItem.Size = new System.Drawing.Size(144, 22); - this.ShowMissle2MenuItem.Text = "Show Missle 2"; - this.ShowMissle2MenuItem.Click += new System.EventHandler(this.ShowMissle2MenuItem_Click); - // - // ShowBallMenuItem - // - this.ShowBallMenuItem.Name = "ShowBallMenuItem"; - this.ShowBallMenuItem.Size = new System.Drawing.Size(144, 22); - this.ShowBallMenuItem.Text = "Show Ball"; - this.ShowBallMenuItem.Click += new System.EventHandler(this.ShowBallMenuItem_Click); + this.AtariSettingsToolStripMenuItem.Name = "AtariSettingsToolStripMenuItem"; + this.AtariSettingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.AtariSettingsToolStripMenuItem.Text = "Settings..."; + this.AtariSettingsToolStripMenuItem.Click += new System.EventHandler(this.AtariSettingsToolStripMenuItem_Click); // // GBSubMenu // @@ -2568,7 +2479,7 @@ // DGBsettingsToolStripMenuItem // this.DGBsettingsToolStripMenuItem.Name = "DGBsettingsToolStripMenuItem"; - this.DGBsettingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.DGBsettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22); this.DGBsettingsToolStripMenuItem.Text = "Settings..."; this.DGBsettingsToolStripMenuItem.Click += new System.EventHandler(this.DGBsettingsToolStripMenuItem_Click); // @@ -2583,7 +2494,7 @@ // GenesisSettingsToolStripMenuItem // this.GenesisSettingsToolStripMenuItem.Name = "GenesisSettingsToolStripMenuItem"; - this.GenesisSettingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.GenesisSettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22); this.GenesisSettingsToolStripMenuItem.Text = "Settings..."; this.GenesisSettingsToolStripMenuItem.Click += new System.EventHandler(this.GenesisSettingsToolStripMenuItem_Click); // @@ -2837,7 +2748,7 @@ this.ShowMenuContextMenuSeparator, this.ShowMenuContextMenuItem}); this.MainFormContextMenu.Name = "contextMenuStrip1"; - this.MainFormContextMenu.Size = new System.Drawing.Size(217, 468); + this.MainFormContextMenu.Size = new System.Drawing.Size(202, 468); this.MainFormContextMenu.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.MainFormContextMenu_Closing); this.MainFormContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MainFormContextMenu_Opening); // @@ -2845,7 +2756,7 @@ // this.OpenRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenRomContextMenuItem.Name = "OpenRomContextMenuItem"; - this.OpenRomContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.OpenRomContextMenuItem.Size = new System.Drawing.Size(201, 22); this.OpenRomContextMenuItem.Text = "Open Rom"; this.OpenRomContextMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click); // @@ -2853,7 +2764,7 @@ // this.LoadLastRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.LoadLastRomContextMenuItem.Name = "LoadLastRomContextMenuItem"; - this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(201, 22); this.LoadLastRomContextMenuItem.Text = "Load Last ROM"; this.LoadLastRomContextMenuItem.Click += new System.EventHandler(this.LoadLastRomContextMenuItem_Click); // @@ -2861,20 +2772,20 @@ // this.StopAVContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopAVContextMenuItem.Name = "StopAVContextMenuItem"; - this.StopAVContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.StopAVContextMenuItem.Size = new System.Drawing.Size(201, 22); this.StopAVContextMenuItem.Text = "Stop AVI/WAV"; this.StopAVContextMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click); // // ContextSeparator_AfterROM // this.ContextSeparator_AfterROM.Name = "ContextSeparator_AfterROM"; - this.ContextSeparator_AfterROM.Size = new System.Drawing.Size(213, 6); + this.ContextSeparator_AfterROM.Size = new System.Drawing.Size(198, 6); // // RecordMovieContextMenuItem // this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS; this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem"; - this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.RecordMovieContextMenuItem.Text = "Record Movie"; this.RecordMovieContextMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click); // @@ -2882,7 +2793,7 @@ // this.PlayMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play; this.PlayMovieContextMenuItem.Name = "PlayMovieContextMenuItem"; - this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.PlayMovieContextMenuItem.Text = "Play Movie"; this.PlayMovieContextMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click); // @@ -2890,7 +2801,7 @@ // this.RestartMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.RestartMovieContextMenuItem.Name = "RestartMovieContextMenuItem"; - this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.RestartMovieContextMenuItem.Text = "Restart Movie"; this.RestartMovieContextMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click); // @@ -2898,7 +2809,7 @@ // this.StopMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieContextMenuItem.Name = "StopMovieContextMenuItem"; - this.StopMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.StopMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.StopMovieContextMenuItem.Text = "Stop Movie"; this.StopMovieContextMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click); // @@ -2906,14 +2817,14 @@ // this.LoadLastMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.LoadLastMovieContextMenuItem.Name = "LoadLastMovieContextMenuItem"; - this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.LoadLastMovieContextMenuItem.Text = "Load Last Movie"; this.LoadLastMovieContextMenuItem.Click += new System.EventHandler(this.LoadLastMovieContextMenuItem_Click); // // BackupMovieContextMenuItem // this.BackupMovieContextMenuItem.Name = "BackupMovieContextMenuItem"; - this.BackupMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.BackupMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.BackupMovieContextMenuItem.Text = "Backup Movie"; this.BackupMovieContextMenuItem.Click += new System.EventHandler(this.BackupMovieContextMenuItem_Click); // @@ -2921,28 +2832,28 @@ // this.StopNoSaveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopNoSaveContextMenuItem.Name = "StopNoSaveContextMenuItem"; - this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(201, 22); this.StopNoSaveContextMenuItem.Text = "Stop Movie without Saving"; this.StopNoSaveContextMenuItem.Click += new System.EventHandler(this.StopMovieWithoutSavingMenuItem_Click); // // ViewSubtitlesContextMenuItem // this.ViewSubtitlesContextMenuItem.Name = "ViewSubtitlesContextMenuItem"; - this.ViewSubtitlesContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.ViewSubtitlesContextMenuItem.Size = new System.Drawing.Size(201, 22); this.ViewSubtitlesContextMenuItem.Text = "View Subtitles"; this.ViewSubtitlesContextMenuItem.Click += new System.EventHandler(this.ViewSubtitlesContextMenuItem_Click); // // AddSubtitleContextMenuItem // this.AddSubtitleContextMenuItem.Name = "AddSubtitleContextMenuItem"; - this.AddSubtitleContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.AddSubtitleContextMenuItem.Size = new System.Drawing.Size(201, 22); this.AddSubtitleContextMenuItem.Text = "Add Subtitle"; this.AddSubtitleContextMenuItem.Click += new System.EventHandler(this.AddSubtitleContextMenuItem_Click); // // ViewCommentsContextMenuItem // this.ViewCommentsContextMenuItem.Name = "ViewCommentsContextMenuItem"; - this.ViewCommentsContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.ViewCommentsContextMenuItem.Size = new System.Drawing.Size(201, 22); this.ViewCommentsContextMenuItem.Text = "View Comments"; this.ViewCommentsContextMenuItem.Click += new System.EventHandler(this.ViewCommentsContextMenuItem_Click); // @@ -2950,27 +2861,27 @@ // this.SaveMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMovieContextMenuItem.Name = "SaveMovieContextMenuItem"; - this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); this.SaveMovieContextMenuItem.Text = "Save Movie"; this.SaveMovieContextMenuItem.Click += new System.EventHandler(this.SaveMovieMenuItem_Click); // // ContextSeparator_AfterMovie // this.ContextSeparator_AfterMovie.Name = "ContextSeparator_AfterMovie"; - this.ContextSeparator_AfterMovie.Size = new System.Drawing.Size(213, 6); + this.ContextSeparator_AfterMovie.Size = new System.Drawing.Size(198, 6); // // UndoSavestateContextMenuItem // this.UndoSavestateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; this.UndoSavestateContextMenuItem.Name = "UndoSavestateContextMenuItem"; - this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(201, 22); this.UndoSavestateContextMenuItem.Text = "Undo Savestate"; this.UndoSavestateContextMenuItem.Click += new System.EventHandler(this.UndoSavestateContextMenuItem_Click); // // ContextSeparator_AfterUndo // this.ContextSeparator_AfterUndo.Name = "ContextSeparator_AfterUndo"; - this.ContextSeparator_AfterUndo.Size = new System.Drawing.Size(213, 6); + this.ContextSeparator_AfterUndo.Size = new System.Drawing.Size(198, 6); // // ConfigContextMenuItem // @@ -2987,7 +2898,7 @@ this.toolStripMenuItem6, this.toolStripMenuItem7}); this.ConfigContextMenuItem.Name = "ConfigContextMenuItem"; - this.ConfigContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.ConfigContextMenuItem.Size = new System.Drawing.Size(201, 22); this.ConfigContextMenuItem.Text = "Config"; // // controllersToolStripMenuItem1 @@ -3077,7 +2988,7 @@ // this.ScreenshotContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera; this.ScreenshotContextMenuItem.Name = "ScreenshotContextMenuItem"; - this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(201, 22); this.ScreenshotContextMenuItem.Text = "Screenshot"; this.ScreenshotContextMenuItem.Click += new System.EventHandler(this.ScreenshotMenuItem_Click); // @@ -3085,26 +2996,26 @@ // this.CloseRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; this.CloseRomContextMenuItem.Name = "CloseRomContextMenuItem"; - this.CloseRomContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.CloseRomContextMenuItem.Size = new System.Drawing.Size(201, 22); this.CloseRomContextMenuItem.Text = "Close ROM"; this.CloseRomContextMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click); // // ClearSRAMContextMenuItem // this.ClearSRAMContextMenuItem.Name = "ClearSRAMContextMenuItem"; - this.ClearSRAMContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.ClearSRAMContextMenuItem.Size = new System.Drawing.Size(201, 22); this.ClearSRAMContextMenuItem.Text = "Close and Clear SRAM"; this.ClearSRAMContextMenuItem.Click += new System.EventHandler(this.ClearSRAMContextMenuItem_Click); // // ShowMenuContextMenuSeparator // this.ShowMenuContextMenuSeparator.Name = "ShowMenuContextMenuSeparator"; - this.ShowMenuContextMenuSeparator.Size = new System.Drawing.Size(213, 6); + this.ShowMenuContextMenuSeparator.Size = new System.Drawing.Size(198, 6); // // ShowMenuContextMenuItem // this.ShowMenuContextMenuItem.Name = "ShowMenuContextMenuItem"; - this.ShowMenuContextMenuItem.Size = new System.Drawing.Size(216, 22); + this.ShowMenuContextMenuItem.Size = new System.Drawing.Size(201, 22); this.ShowMenuContextMenuItem.Text = "Show Menu"; this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click); // @@ -3355,9 +3266,6 @@ private System.Windows.Forms.ToolStripMenuItem PCEBGViewerMenuItem; private System.Windows.Forms.ToolStripMenuItem ScreenshotContextMenuItem; private System.Windows.Forms.ToolStripMenuItem AtariSubMenu; - private System.Windows.Forms.ToolStripMenuItem AtariBWMenuItem; - private System.Windows.Forms.ToolStripMenuItem AtariLeftDifficultyMenuItem; - private System.Windows.Forms.ToolStripMenuItem AtariRightDifficultyMenuItem; private System.Windows.Forms.ToolStripMenuItem ConfigEnableSubMenu; private System.Windows.Forms.ToolStripMenuItem EnableContextMenuMenuItem; private System.Windows.Forms.ToolStripMenuItem BackupSavestatesMenuItem; @@ -3407,14 +3315,6 @@ private System.Windows.Forms.ToolStripMenuItem SaveMovieMenuItem; private System.Windows.Forms.ToolStripMenuItem SaveMovieContextMenuItem; private System.Windows.Forms.ToolStripMenuItem VirtualPadMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator26; - private System.Windows.Forms.ToolStripMenuItem AtariShowBGMenuItem; - private System.Windows.Forms.ToolStripMenuItem ShowPlayer1MenuItem; - private System.Windows.Forms.ToolStripMenuItem ShowPlayer2MenuItem; - private System.Windows.Forms.ToolStripMenuItem ShowMissle1MenuItem; - private System.Windows.Forms.ToolStripMenuItem ShowMissle2MenuItem; - private System.Windows.Forms.ToolStripMenuItem ShowBallMenuItem; - private System.Windows.Forms.ToolStripMenuItem AtariShowPlayfieldMenuItem; private System.Windows.Forms.ToolStripMenuItem GBGPUViewerMenuItem; private System.Windows.Forms.ToolStripMenuItem AudioThrottleMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator27; @@ -3475,6 +3375,7 @@ private System.Windows.Forms.ToolStripMenuItem DGBsettingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem GenesisSubMenu; private System.Windows.Forms.ToolStripMenuItem GenesisSettingsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem AtariSettingsToolStripMenuItem; } } diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 2af126d7d9..8f32505de9 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1401,103 +1401,9 @@ namespace BizHawk.Client.EmuHawk #region Atari - private void AtariSubMenu_DropDownOpened(object sender, EventArgs e) + private void AtariSettingsToolStripMenuItem_Click(object sender, EventArgs e) { - AtariBWMenuItem.Checked = Global.Config.Atari2600_BW; - AtariLeftDifficultyMenuItem.Checked = Global.Config.Atari2600_LeftDifficulty; - AtariRightDifficultyMenuItem.Checked = Global.Config.Atari2600_RightDifficulty; - - AtariShowBGMenuItem.Checked = Global.Config.Atari2600_ShowBG; - ShowPlayer1MenuItem.Checked = Global.Config.Atari2600_ShowPlayer1; - ShowPlayer2MenuItem.Checked = Global.Config.Atari2600_ShowPlayer2; - ShowMissle1MenuItem.Checked = Global.Config.Atari2600_ShowMissle1; - ShowMissle2MenuItem.Checked = Global.Config.Atari2600_ShowMissle2; - ShowBallMenuItem.Checked = Global.Config.Atari2600_ShowBall; - AtariShowPlayfieldMenuItem.Checked = Global.Config.Atari2600_ShowPlayfield; - } - - private void AtariBWMenuItem_Click(object sender, EventArgs e) - { - Global.Config.Atari2600_BW ^= true; - - if (Global.Emulator is Atari2600) - { - (Global.Emulator as Atari2600).SetBw(Global.Config.Atari2600_BW); - } - - GlobalWin.OSD.AddMessage(Global.Config.Atari2600_BW - ? "Setting the Black and White Switch to On" - : "Setting the Black and White Switch to Off"); - } - - private void AtariLeftDifficultyMenuItem_Click(object sender, EventArgs e) - { - Global.Config.Atari2600_LeftDifficulty ^= true; - - if (Global.Emulator is Atari2600) - { - (Global.Emulator as Atari2600).SetP0Diff(Global.Config.Atari2600_BW); - } - - GlobalWin.OSD.AddMessage(Global.Config.Atari2600_LeftDifficulty - ? "Setting Left Difficulty to B" - : "Setting Left Difficulty to A"); - } - - private void AtariRightDifficultyMenuItem_Click(object sender, EventArgs e) - { - Global.Config.Atari2600_RightDifficulty ^= true; - - if (Global.Emulator is Atari2600) - { - (Global.Emulator as Atari2600).SetP1Diff(Global.Config.Atari2600_BW); - } - - GlobalWin.OSD.AddMessage(Global.Config.Atari2600_RightDifficulty - ? "Setting Right Difficulty to B" - : "Setting Right Difficulty to A"); - } - - private void AtariShowBGMenuItem_Click(object sender, EventArgs e) - { - Global.Config.Atari2600_ShowBG ^= true; - CoreFileProvider.SyncCoreCommInputSignals(); - } - - private void AtariShowPlayfieldMenuItem_Click(object sender, EventArgs e) - { - Global.Config.Atari2600_ShowPlayfield ^= true; - CoreFileProvider.SyncCoreCommInputSignals(); - } - - private void ShowPlayer1MenuItem_Click(object sender, EventArgs e) - { - Global.Config.Atari2600_ShowPlayer1 ^= true; - CoreFileProvider.SyncCoreCommInputSignals(); - } - - private void ShowPlayer2MenuItem_Click(object sender, EventArgs e) - { - Global.Config.Atari2600_ShowPlayer2 ^= true; - CoreFileProvider.SyncCoreCommInputSignals(); - } - - private void ShowMissle1MenuItem_Click(object sender, EventArgs e) - { - Global.Config.Atari2600_ShowMissle1 ^= true; - CoreFileProvider.SyncCoreCommInputSignals(); - } - - private void ShowMissle2MenuItem_Click(object sender, EventArgs e) - { - Global.Config.Atari2600_ShowMissle2 ^= true; - CoreFileProvider.SyncCoreCommInputSignals(); - } - - private void ShowBallMenuItem_Click(object sender, EventArgs e) - { - Global.Config.Atari2600_ShowBall ^= true; - CoreFileProvider.SyncCoreCommInputSignals(); + config.GenericCoreConfig.DoDialog(this, "Atari 2600 Settings"); } #endregion diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 27d613ff1e..e2b97d37f1 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -3294,10 +3294,9 @@ namespace BizHawk.Client.EmuHawk nextEmulator = new SMS(nextComm, game, rom.RomData, Global.Config.GetCoreSettings(), Global.Config.GetCoreSyncSettings()); break; case "A26": - nextEmulator = new Atari2600(nextComm, game, rom.FileData); - ((Atari2600)nextEmulator).SetBw(Global.Config.Atari2600_BW); - ((Atari2600)nextEmulator).SetP0Diff(Global.Config.Atari2600_LeftDifficulty); - ((Atari2600)nextEmulator).SetP1Diff(Global.Config.Atari2600_RightDifficulty); + nextEmulator = new Atari2600(nextComm, game, rom.FileData, + Global.Config.GetCoreSettings(), + Global.Config.GetCoreSyncSettings()); break; case "PCE": case "PCECD": @@ -3724,6 +3723,5 @@ namespace BizHawk.Client.EmuHawk } #endregion - } } diff --git a/BizHawk.Emulation.Common/Interfaces/CoreComms.cs b/BizHawk.Emulation.Common/Interfaces/CoreComms.cs index 4ce5667ae0..7afd844f63 100644 --- a/BizHawk.Emulation.Common/Interfaces/CoreComms.cs +++ b/BizHawk.Emulation.Common/Interfaces/CoreComms.cs @@ -26,7 +26,7 @@ namespace BizHawk.Emulation.Common public bool SNES_ShowBG1_1, SNES_ShowBG2_1, SNES_ShowBG3_1, SNES_ShowBG4_1; public bool SNES_ShowOBJ_0, SNES_ShowOBJ_1, SNES_ShowOBJ_2, SNES_ShowOBJ_3; - public bool Atari2600_ShowBG = true, Atari2600_ShowPlayer1 = true, Atari2600_ShowPlayer2 = true, Atari2600_ShowMissle1 = true, Atari2600_ShowMissle2 = true, Atari2600_ShowBall = true, Atari2600_ShowPF = true; + //public bool Atari2600_ShowBG = true, Atari2600_ShowPlayer1 = true, Atari2600_ShowPlayer2 = true, Atari2600_ShowMissle1 = true, Atari2600_ShowMissle2 = true, Atari2600_ShowBall = true, Atari2600_ShowPF = true; /// /// if this is set, then the cpu should dump trace info to CpuTraceStream diff --git a/BizHawk.Emulation.Common/Interfaces/IEmulator.cs b/BizHawk.Emulation.Common/Interfaces/IEmulator.cs index 4c6cd32426..47904b2d29 100644 --- a/BizHawk.Emulation.Common/Interfaces/IEmulator.cs +++ b/BizHawk.Emulation.Common/Interfaces/IEmulator.cs @@ -148,7 +148,8 @@ namespace BizHawk.Emulation.Common // ====settings interface==== // in addition to these methods, it's expected that the constructor or Load() method - // will take a SyncSettings object to set the initial state of the core (and possibly a settings object?) + // will take a Settings and SyncSettings object to set the initial state of the core + // (if those are null, default settings are to be used) /// /// get the current core settings, excepting movie settings. should be a clone of the active in-core object, and changes to the return diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs index 78968b0372..bb812c61d8 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs @@ -262,13 +262,13 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 return value; } - private bool bw; - private bool p0difficulty = true; - private bool p1difficulty = true; + //private bool bw; + //private bool p0difficulty = true; + //private bool p1difficulty = true; - public void SetBw(bool setting) { bw = setting; } - public void SetP0Diff(bool setting) { p0difficulty = setting; } - public void SetP1Diff(bool setting) { p1difficulty = setting; } + //public void SetBw(bool setting) { bw = setting; } + //public void SetP0Diff(bool setting) { p0difficulty = setting; } + //public void SetP1Diff(bool setting) { p1difficulty = setting; } public byte ReadConsoleSwitches(bool peek) { @@ -280,9 +280,9 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 if (reset) value &= 0xFE; if (select) value &= 0xFD; - if (bw) value &= 0xF7; - if (p0difficulty) value &= 0xBF; - if (p1difficulty) value &= 0x7F; + if (SyncSettings.BW) value &= 0xF7; + if (SyncSettings.LeftDifficulty) value &= 0xBF; + if (SyncSettings.RightDifficulty) value &= 0x7F; if(!peek) _islag = false; return value; } diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs index dea2f1826a..7b5f134a84 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs @@ -4,6 +4,7 @@ using System.IO; using BizHawk.Common; using BizHawk.Emulation.Common; +using System.ComponentModel; namespace BizHawk.Emulation.Cores.Atari.Atari2600 { @@ -21,9 +22,12 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 public bool StartAsyncSound() { return true; } public void EndAsyncSound() { } - public Atari2600(CoreComm comm, GameInfo game, byte[] rom) + public Atari2600(CoreComm comm, GameInfo game, byte[] rom, object Settings, object SyncSettings) { CoreComm = comm; + this.Settings = (A2600Settings)Settings ?? A2600Settings.GetDefaults(); + this.SyncSettings = (A2600SyncSettings)SyncSettings ?? A2600SyncSettings.GetDefaults(); + var domains = new List(1) { new MemoryDomain("Main RAM", 128, MemoryDomain.Endian.Little, addr => ram[addr & 127], (addr, value) => ram[addr & 127] = value), @@ -131,10 +135,67 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 public MemoryDomainList MemoryDomains { get { return memoryDomains; } } public void Dispose() { } - public object GetSettings() { return null; } - public object GetSyncSettings() { return null; } - public bool PutSettings(object o) { return false; } - public bool PutSyncSettings(object o) { return false; } + public object GetSettings() { return Settings.Clone(); } + public object GetSyncSettings() { return SyncSettings.Clone(); } + public bool PutSettings(object o) { Settings = (A2600Settings)o; return false; } + public bool PutSyncSettings(object o) { SyncSettings = (A2600SyncSettings)o; return false; } + + public A2600Settings Settings { get; private set; } + public A2600SyncSettings SyncSettings { get; private set; } + + public class A2600Settings + { + // todo: descriptions + public bool ShowBG { get; set; } + public bool ShowPlayer1 { get; set; } + public bool ShowPlayer2 { get; set; } + public bool ShowMissle1 { get; set; } + public bool ShowMissle2 { get; set; } + public bool ShowBall { get; set; } + public bool ShowPlayfield { get; set; } + + public A2600Settings Clone() + { + return (A2600Settings)MemberwiseClone(); + } + public static A2600Settings GetDefaults() + { + return new A2600Settings + { + ShowBG = true, + ShowPlayer1 = true, + ShowPlayer2 = true, + ShowMissle1 = true, + ShowMissle2 = true, + ShowBall = true, + ShowPlayfield = true + }; + } + } + + public class A2600SyncSettings + { + [Description("Set the TV Type switch on the console to B&W or Color")] + public bool BW { get; set; } + [Description("Set the Left Difficulty switch on the console")] + public bool LeftDifficulty { get; set; } + [Description("Set the Right Difficulty switch on the console")] + public bool RightDifficulty { get; set; } + + public A2600SyncSettings Clone() + { + return (A2600SyncSettings)MemberwiseClone(); + } + public static A2600SyncSettings GetDefaults() + { + return new A2600SyncSettings + { + BW = false, + LeftDifficulty = true, + RightDifficulty = true + }; + } + } } } diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/TIA.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/TIA.cs index 8e37344942..7fcccb4416 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/TIA.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/TIA.cs @@ -708,12 +708,12 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 // Pick the pixel color from collisions uint pixelColor = 0x000000; - if (core.CoreComm.Atari2600_ShowBG) + if (core.Settings.ShowBG) { pixelColor = palette[playField.bkColor]; } - if ((collisions & CXPF) != 0 && core.CoreComm.Atari2600_ShowPF) + if ((collisions & CXPF) != 0 && core.Settings.ShowPlayfield) { if (playField.score) { @@ -735,7 +735,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 if ((collisions & CXBL) != 0) { ball.collisions |= collisions; - if (core.CoreComm.Atari2600_ShowBall) + if (core.Settings.ShowBall) { pixelColor = palette[playField.pfColor]; } @@ -744,7 +744,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 if ((collisions & CXM1) != 0) { player1.missile.Collisions |= collisions; - if (core.CoreComm.Atari2600_ShowMissle2) + if (core.Settings.ShowMissle2) { pixelColor = palette[player1.color]; } @@ -753,7 +753,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 if ((collisions & CXP1) != 0) { player1.collisions |= collisions; - if (core.CoreComm.Atari2600_ShowPlayer2) + if (core.Settings.ShowPlayer2) { pixelColor = palette[player1.color]; } @@ -762,7 +762,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 if ((collisions & CXM0) != 0) { player0.missile.Collisions |= collisions; - if (core.CoreComm.Atari2600_ShowMissle1) + if (core.Settings.ShowMissle1) { pixelColor = palette[player0.color]; } @@ -771,13 +771,13 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 if ((collisions & CXP0) != 0) { player0.collisions |= collisions; - if (core.CoreComm.Atari2600_ShowPlayer1) + if (core.Settings.ShowPlayer1) { pixelColor = palette[player0.color]; } } - if (playField.priority && (collisions & CXPF) != 0 && core.CoreComm.Atari2600_ShowPF) + if (playField.priority && (collisions & CXPF) != 0 && core.Settings.ShowPlayfield) { if (playField.score) {