From 52fd33153afd5dcd8ab560d982e17ba889be13ca Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 30 Mar 2012 03:43:25 +0000 Subject: [PATCH] Atari - fix recording and playback of atari resets --- BizHawk.MultiClient/movie/InputAdapters.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs index dc2cc52c5a..0f330b05af 100644 --- a/BizHawk.MultiClient/movie/InputAdapters.cs +++ b/BizHawk.MultiClient/movie/InputAdapters.cs @@ -194,7 +194,11 @@ namespace BizHawk.MultiClient * PC Engine: some kind of command key, since reset isn't used (adelikat: unimplmented command was */ } - if (ControlType == "NES Controller" || ControlType == "Atari 2600 Basic Controller") + if (ControlType == "Atari 2600 Basic Controller") + { + input.Append(IsBasePressed("Reset") ? "r" : "."); + } + if (ControlType == "NES Controller") { input.Append(IsBasePressed("Reset") ? Global.COMMANDS[ControlType]["Reset"] : Global.Emulator.IsLagFrame ? Global.COMMANDS[ControlType]["Lag"] : "."); @@ -402,6 +406,10 @@ namespace BizHawk.MultiClient { start = 1; } + if (ControlType == "Atari 2600 Basic Controller") + { + Force("Reset", mnemonic[1] != '.' && mnemonic[1] != '0'); + } for (int player = 1; player <= Global.PLAYERS[ControlType]; player++) { int srcindex = (player - 1) * (Global.BUTTONS[ControlType].Count + 1);