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

Atari 2600 - add a Playfield toggle

This commit is contained in:
adelikat 2012-10-30 23:38:53 +00:00
parent 137ffd8081
commit 1d4a8fd3ba
6 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation/Consoles/Atari/2600/TIA.cs
View File

@ -704,7 +704,7 @@ namespace BizHawk.Emulation.Consoles.Atari
pixelColor = palette[playField.bkColor]; pixelColor = palette[playField.bkColor];
} }
if ((collisions & CXPF) != 0) // && core.CoreInputComm.Atari2600_ShowPF) if ((collisions & CXPF) != 0 && core.CoreInputComm.Atari2600_ShowPF)
{ {
if (playField.score) if (playField.score)
{ {

2
BizHawk.Emulation/Interfaces/CoreComms.cs
View File

@ -16,7 +16,7 @@ namespace BizHawk
public bool SNES_ShowBG1_1, SNES_ShowBG2_1, SNES_ShowBG3_1, SNES_ShowBG4_1; 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 SNES_ShowOBJ_0, SNES_ShowOBJ_1, SNES_ShowOBJ_2, SNES_ShowOBJ_3;
public bool Atari2600_ShowBG, Atari2600_ShowPlayer1, Atari2600_ShowPlayer2, Atari2600_ShowMissle1, Atari2600_ShowMissle2, Atari2600_ShowBall; public bool Atari2600_ShowBG, Atari2600_ShowPlayer1, Atari2600_ShowPlayer2, Atari2600_ShowMissle1, Atari2600_ShowMissle2, Atari2600_ShowBall, Atari2600_ShowPF;
/// <summary> /// <summary>
/// if this is set, then the cpu should dump trace info to CpuTraceStream /// if this is set, then the cpu should dump trace info to CpuTraceStream

1
BizHawk.MultiClient/Config.cs
View File

@ -700,6 +700,7 @@ namespace BizHawk.MultiClient
public bool Atari2600_ShowMissle1 = true; public bool Atari2600_ShowMissle1 = true;
public bool Atari2600_ShowMissle2 = true; public bool Atari2600_ShowMissle2 = true;
public bool Atari2600_ShowBall = true; public bool Atari2600_ShowBall = true;
public bool Atari2600_ShowPlayfield = true;
} }
public class SMSControllerTemplate public class SMSControllerTemplate

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

@ -305,6 +305,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.showPlayfieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.StatusSlot0.SuspendLayout(); this.StatusSlot0.SuspendLayout();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
@ -2023,6 +2024,7 @@
this.rightDifficultyToolStripMenuItem, this.rightDifficultyToolStripMenuItem,
this.toolStripSeparator26, this.toolStripSeparator26,
this.showBGToolStripMenuItem, this.showBGToolStripMenuItem,
this.showPlayfieldToolStripMenuItem,
this.showPlayer1ToolStripMenuItem, this.showPlayer1ToolStripMenuItem,
this.showPlayer2ToolStripMenuItem, this.showPlayer2ToolStripMenuItem,
this.showMissle1ToolStripMenuItem, this.showMissle1ToolStripMenuItem,
@ -2636,6 +2638,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);
// //
// showPlayfieldToolStripMenuItem
//
this.showPlayfieldToolStripMenuItem.Name = "showPlayfieldToolStripMenuItem";
this.showPlayfieldToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
this.showPlayfieldToolStripMenuItem.Text = "Show Playfield";
this.showPlayfieldToolStripMenuItem.Click += new System.EventHandler(this.showPlayfieldToolStripMenuItem_Click);
//
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
@ -2952,6 +2961,7 @@
private System.Windows.Forms.ToolStripMenuItem showMissle1ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem showMissle1ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem showMissle2ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem showMissle2ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem showBallToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem showBallToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem showPlayfieldToolStripMenuItem;
} }
} }

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

@ -1738,6 +1738,7 @@ namespace BizHawk.MultiClient
showMissle1ToolStripMenuItem.Checked = Global.Config.Atari2600_ShowMissle1; showMissle1ToolStripMenuItem.Checked = Global.Config.Atari2600_ShowMissle1;
showMissle2ToolStripMenuItem.Checked = Global.Config.Atari2600_ShowMissle2; showMissle2ToolStripMenuItem.Checked = Global.Config.Atari2600_ShowMissle2;
showBallToolStripMenuItem.Checked = Global.Config.Atari2600_ShowBall; showBallToolStripMenuItem.Checked = Global.Config.Atari2600_ShowBall;
showPlayfieldToolStripMenuItem.Checked = Global.Config.Atari2600_ShowPlayfield;
} }
private void skipBIOSIntroToolStripMenuItem_Click(object sender, EventArgs e) private void skipBIOSIntroToolStripMenuItem_Click(object sender, EventArgs e)

7
BizHawk.MultiClient/MainForm.cs
View File

@ -383,6 +383,7 @@ namespace BizHawk.MultiClient
Global.CoreInputComm.Atari2600_ShowMissle1 = Global.Config.Atari2600_ShowMissle1; Global.CoreInputComm.Atari2600_ShowMissle1 = Global.Config.Atari2600_ShowMissle1;
Global.CoreInputComm.Atari2600_ShowMissle2 = Global.Config.Atari2600_ShowMissle2; Global.CoreInputComm.Atari2600_ShowMissle2 = Global.Config.Atari2600_ShowMissle2;
Global.CoreInputComm.Atari2600_ShowBall = Global.Config.Atari2600_ShowBall; Global.CoreInputComm.Atari2600_ShowBall = Global.Config.Atari2600_ShowBall;
Global.CoreInputComm.Atari2600_ShowPF = Global.Config.Atari2600_ShowPlayfield;
} }
void SyncPresentationMode() void SyncPresentationMode()
@ -4209,5 +4210,11 @@ namespace BizHawk.MultiClient
Global.Config.Atari2600_ShowBall ^= true; Global.Config.Atari2600_ShowBall ^= true;
SyncCoreInputComm(); SyncCoreInputComm();
} }
private void showPlayfieldToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.Atari2600_ShowPlayfield ^= true;
SyncCoreInputComm();
}
} }
} }