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

more unfinished controller infrastructure

This commit is contained in:
goyuken 2014-02-27 20:59:10 +00:00
parent dcb2098055
commit 5227a5a05d
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs
View File

@ -53,7 +53,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
ControlDefUnMerger RightU; ControlDefUnMerger RightU;
ControllerDefinition Definition; ControllerDefinition Definition;
public NesDeck(INesPort Left, INesPort Right) public NesDeck(INesPort Left, INesPort Right, Func<int, int, bool> PPUCallback)
{ {
this.Left = Left; this.Left = Left;
this.Right = Right; this.Right = Right;
@ -61,6 +61,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
Definition = ControllerDefMerger.GetMerged(new[] { Left.GetDefinition(), Right.GetDefinition() }, out cdum); Definition = ControllerDefMerger.GetMerged(new[] { Left.GetDefinition(), Right.GetDefinition() }, out cdum);
LeftU = cdum[0]; LeftU = cdum[0];
RightU = cdum[1]; RightU = cdum[1];
// apply hacks
// if this list gets very long, then something should be changed
// if it stays short, then no problem
if (Left is FourScore)
(Left as FourScore).RightPort = false;
if (Right is FourScore)
(Right as FourScore).RightPort = true;
if (Left is Zapper)
(Left as Zapper).PPUCallback = PPUCallback;
if (Right is Zapper)
(Right as Zapper).PPUCallback = PPUCallback;
} }
public void Strobe(StrobeInfo s, IController c) public void Strobe(StrobeInfo s, IController c)
@ -386,7 +398,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
ControllerDefinition Definition; ControllerDefinition Definition;
public FamicomDeck(IFamicomExpansion ExpSlot) public FamicomDeck(IFamicomExpansion ExpSlot, Func<int, int, bool> PPUCallback)
{ {
Player3 = ExpSlot; Player3 = ExpSlot;
List<ControlDefUnMerger> cdum; List<ControlDefUnMerger> cdum;
@ -396,6 +408,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
Player1U = cdum[0]; Player1U = cdum[0];
Player2U = cdum[1]; Player2U = cdum[1];
Player3U = cdum[2]; Player3U = cdum[2];
// hack
if (Player3 is Zapper)
(Player3 as Zapper).PPUCallback = PPUCallback;
} }
public void Strobe(StrobeInfo s, IController c) public void Strobe(StrobeInfo s, IController c)