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

atari 7800: for the two 7800 controller definitions (proline and lightgun), remove the two difficulty switches, and change the name of the "BW" switch to "Pause", to reflect what's actually on the console. other controller definitions not changed because they're used for emu7800 in 2600 mode, which DOES have those buttons

This commit is contained in:
goyuken 2012-12-15 18:11:54 +00:00
parent 0fb5be2420
commit 042855acac
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs
View File

@ -125,9 +125,7 @@ namespace BizHawk.Emulation
// on the console
"Reset",
"Select",
"BW", // should be "Color"??
"Left Difficulty", // better not put P# on these as they might not correspond to player numbers
"Right Difficulty",
"Pause",
// ports
"P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Trigger", "P1 Trigger 2",
"P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Trigger", "P2 Trigger 2"
@ -141,9 +139,7 @@ namespace BizHawk.Emulation
// on the console
"Reset",
"Select",
"BW", // should be "Color"??
"Left Difficulty", // better not put P# on these as they might not correspond to player numbers
"Right Difficulty",
"Pause",
// ports
"P1 Trigger",
"P2 Trigger"
@ -189,6 +185,12 @@ namespace BizHawk.Emulation
s.RaiseInput(0, MachineInput.LeftDifficulty, c["Left Difficulty"]);
s.RaiseInput(0, MachineInput.RightDifficulty, c["Right Difficulty"]);
}
static void ConvertConsoleButtons7800(IController c, InputState s)
{
s.RaiseInput(0, MachineInput.Reset, c["Reset"]);
s.RaiseInput(0, MachineInput.Select, c["Select"]);
s.RaiseInput(0, MachineInput.Color, c["Pause"]);
}
static void ConvertDirections(IController c, InputState s, int p)
{
string ps = string.Format("P{0} ", p + 1);
@ -277,7 +279,7 @@ namespace BizHawk.Emulation
static void ConvertProLineJoystick(IController c, InputState s)
{
s.ClearAllInput();
ConvertConsoleButtons(c, s);
ConvertConsoleButtons7800(c, s);
ConvertDirections(c, s, 0);
ConvertDirections(c, s, 1);
s.RaiseInput(0, MachineInput.Fire, c["P1 Trigger"]);
@ -288,7 +290,7 @@ namespace BizHawk.Emulation
static void ConvertLightgun(IController c, InputState s)
{
s.ClearAllInput();
ConvertConsoleButtons(c, s);
ConvertConsoleButtons7800(c, s);
ConvertTrigger(c, s, 0);
ConvertTrigger(c, s, 1);
s.RaiseLightgunPos(0, (int)c.GetFloat("P1 VPos"), (int)c.GetFloat("P1 HPos"));