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

Atari 7800 - make difficulty switches behave like toggles instead of buttons, also add mnemonic info for them, fixes #726

This commit is contained in:
adelikat 2016-11-11 08:44:28 -06:00
parent 8505cebbf8
commit 75654b9f33
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs
View File

@ -104,7 +104,10 @@ namespace BizHawk.Client.Common
{ "Triangle", 'T' }, { "Triangle", 'T' },
{ "Circle", 'O' }, { "Circle", 'O' },
{ "Cross", 'X' }, { "Cross", 'X' },
{ "Square", 'Q' } { "Square", 'Q' },
{ "Left Difficulty", 'l' },
{ "Right Difficulty", 'r' }
}; };
private readonly Dictionary<string, Dictionary<string, char>> SystemOverrides = new Dictionary<string, Dictionary<string, char>> private readonly Dictionary<string, Dictionary<string, char>> SystemOverrides = new Dictionary<string, Dictionary<string, char>>

22
BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800Control.cs
View File

@ -219,16 +219,16 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
s.RaiseInput(0, MachineInput.Reset, c["Reset"]); s.RaiseInput(0, MachineInput.Reset, c["Reset"]);
s.RaiseInput(0, MachineInput.Select, c["Select"]); s.RaiseInput(0, MachineInput.Select, c["Select"]);
s.RaiseInput(0, MachineInput.Color, c["BW"]); s.RaiseInput(0, MachineInput.Color, c["BW"]);
s.RaiseInput(0, MachineInput.LeftDifficulty, c["Left Difficulty"]); if (c["Left Difficulty"]) { s.RaiseInput(0, MachineInput.LeftDifficulty, c["Left Difficulty"]); }
s.RaiseInput(0, MachineInput.RightDifficulty, c["Right Difficulty"]); if (c["Right Difficulty"]) { s.RaiseInput(0, MachineInput.RightDifficulty, c["Right Difficulty"]); }
} }
static void ConvertConsoleButtons7800(IController c, InputState s) static void ConvertConsoleButtons7800(IController c, InputState s)
{ {
s.RaiseInput(0, MachineInput.Reset, c["Reset"]); s.RaiseInput(0, MachineInput.Reset, c["Reset"]);
s.RaiseInput(0, MachineInput.Select, c["Select"]); s.RaiseInput(0, MachineInput.Select, c["Select"]);
s.RaiseInput(0, MachineInput.Color, c["Pause"]); s.RaiseInput(0, MachineInput.Color, c["Pause"]);
s.RaiseInput(0, MachineInput.LeftDifficulty, c["Left Difficulty"]); if (c["Left Difficulty"]) { s.RaiseInput(0, MachineInput.LeftDifficulty, c["Left Difficulty"]); }
s.RaiseInput(0, MachineInput.RightDifficulty, c["Right Difficulty"]); if (c["Right Difficulty"]) { s.RaiseInput(0, MachineInput.RightDifficulty, c["Right Difficulty"]); }
} }
static void ConvertDirections(IController c, InputState s, int p) static void ConvertDirections(IController c, InputState s, int p)
{ {
@ -246,7 +246,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
static void ConvertJoystick(IController c, InputState s) static void ConvertJoystick(IController c, InputState s)
{ {
s.ClearAllInput(); s.ClearControllerInput();
ConvertConsoleButtons(c, s); ConvertConsoleButtons(c, s);
ConvertDirections(c, s, 0); ConvertDirections(c, s, 0);
ConvertDirections(c, s, 1); ConvertDirections(c, s, 1);
@ -255,7 +255,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
} }
static void ConvertPaddles(IController c, InputState s) static void ConvertPaddles(IController c, InputState s)
{ {
s.ClearAllInput(); s.ClearControllerInput();
ConvertConsoleButtons(c, s); ConvertConsoleButtons(c, s);
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
@ -266,7 +266,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
} }
static void ConvertKeypad(IController c, InputState s) static void ConvertKeypad(IController c, InputState s)
{ {
s.ClearAllInput(); s.ClearControllerInput();
ConvertConsoleButtons(c, s); ConvertConsoleButtons(c, s);
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
@ -294,7 +294,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
}; };
static void ConvertDriving(IController c, InputState s) static void ConvertDriving(IController c, InputState s)
{ {
s.ClearAllInput(); s.ClearControllerInput();
ConvertConsoleButtons(c, s); ConvertConsoleButtons(c, s);
ConvertTrigger(c, s, 0); ConvertTrigger(c, s, 0);
ConvertTrigger(c, s, 1); ConvertTrigger(c, s, 1);
@ -303,7 +303,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
} }
static void ConvertBoosterGrip(IController c, InputState s) static void ConvertBoosterGrip(IController c, InputState s)
{ {
s.ClearAllInput(); s.ClearControllerInput();
ConvertConsoleButtons(c, s); ConvertConsoleButtons(c, s);
ConvertDirections(c, s, 0); ConvertDirections(c, s, 0);
ConvertDirections(c, s, 1); ConvertDirections(c, s, 1);
@ -317,7 +317,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
} }
static void ConvertProLineJoystick(IController c, InputState s) static void ConvertProLineJoystick(IController c, InputState s)
{ {
s.ClearAllInput(); s.ClearControllerInput();
ConvertConsoleButtons7800(c, s); ConvertConsoleButtons7800(c, s);
ConvertDirections(c, s, 0); ConvertDirections(c, s, 0);
ConvertDirections(c, s, 1); ConvertDirections(c, s, 1);
@ -328,7 +328,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
} }
static void ConvertLightgun(IController c, InputState s) static void ConvertLightgun(IController c, InputState s)
{ {
s.ClearAllInput(); s.ClearControllerInput();
ConvertConsoleButtons7800(c, s); ConvertConsoleButtons7800(c, s);
ConvertTrigger(c, s, 0); ConvertTrigger(c, s, 0);
ConvertTrigger(c, s, 1); ConvertTrigger(c, s, 1);

9
EMU7800/Core/InputState.cs
View File

@ -227,6 +227,15 @@ namespace EMU7800.Core
ClearRightJackInput(); ClearRightJackInput();
} }
// For Bizhawk
// Emu7800's client does not call Clear input every frame so console switches behave like switches
// Bizhawk needs to call a clear input function every frame, if we put switches in there, they would behave like buttons
public void ClearControllerInput()
{
ClearLeftJackInput();
ClearRightJackInput();
}
public void ClearInputByPlayer(int playerNo) public void ClearInputByPlayer(int playerNo)
{ {
_nextInputState[OhmsIndex + (playerNo & 3)] = 0; _nextInputState[OhmsIndex + (playerNo & 3)] = 0;

BIN
References/EMU7800.dll
View File

Binary file not shown.