diff --git a/BizHawk.Emulation/Interfaces/Base Implementations/Movies.cs b/BizHawk.Emulation/Interfaces/Base Implementations/Movies.cs index 8490914bd1..e98bd7be75 100644 --- a/BizHawk.Emulation/Interfaces/Base Implementations/Movies.cs +++ b/BizHawk.Emulation/Interfaces/Base Implementations/Movies.cs @@ -63,8 +63,6 @@ namespace BizHawk writer.Seek(frame * 2, SeekOrigin.Begin); writer.Write((ushort)encodedValue); } - - public bool Autofire { get { return false; } set { } } } public class InputPlayback : IController @@ -123,7 +121,5 @@ namespace BizHawk public bool IsSticky(string button) { return false; } public bool MovieEnded { get { return frame >= input.Length; } } - - public bool Autofire { get { return false; } set { } } } } \ No newline at end of file diff --git a/BizHawk.Emulation/Interfaces/Base Implementations/NullController.cs b/BizHawk.Emulation/Interfaces/Base Implementations/NullController.cs index 67e36e519c..4412d4d79b 100644 --- a/BizHawk.Emulation/Interfaces/Base Implementations/NullController.cs +++ b/BizHawk.Emulation/Interfaces/Base Implementations/NullController.cs @@ -15,6 +15,5 @@ private static NullController nullController = new NullController(); public static NullController GetNullController() { return nullController; } - public bool Autofire { get { return false; } set { } } } } \ No newline at end of file diff --git a/BizHawk.Emulation/Interfaces/IController.cs b/BizHawk.Emulation/Interfaces/IController.cs index cce7d76578..a6b775e754 100644 --- a/BizHawk.Emulation/Interfaces/IController.cs +++ b/BizHawk.Emulation/Interfaces/IController.cs @@ -22,8 +22,5 @@ namespace BizHawk //TODO - why does this have a frame argument. must be removed. void UpdateControls(int frame); - - //Flag for whether the controller will behave like a autofire (rapid fire) controller - bool Autofire { get; set; } } } diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs index a896352121..4e53acac7c 100644 --- a/BizHawk.MultiClient/movie/InputAdapters.cs +++ b/BizHawk.MultiClient/movie/InputAdapters.cs @@ -11,7 +11,6 @@ namespace BizHawk.MultiClient public class ClickyVirtualPadController : IController { public ControllerDefinition Type { get; set; } - public bool Autofire { get { return false; } set { } } //TODO: do we want virtualpad autofire pads? public bool this[string button] { get { return IsPressed(button); } } public float GetFloat(string name) { return 0.0f; } //TODO public void UpdateControls(int frame) { } @@ -49,7 +48,7 @@ namespace BizHawk.MultiClient public bool this[string button] { get { return IsPressed(button); } } public float GetFloat(string name) { return 0.0f; } //TODO public void UpdateControls(int frame) { } - public bool Autofire { get { return false; } set { } } + public bool IsPressed(string button) { if (Global.Config.AllowUD_LR == true) @@ -83,7 +82,7 @@ namespace BizHawk.MultiClient public virtual bool IsPressed(string button) { return this[button]; } public float GetFloat(string name) { return 0.0f; } //TODO public void UpdateControls(int frame) { } - public bool Autofire { get { return false; } set { } } + public virtual void LatchFrom(IController source) { foreach (string button in source.Type.BoolButtons) @@ -98,7 +97,6 @@ namespace BizHawk.MultiClient public bool IsPressed(string button) { return this[button]; } public float GetFloat(string name) { return 0.0f; } //TODO public void UpdateControls(int frame) { } - public bool Autofire { get { return false; } set { } } //TODO: sticky autofire buttons? public IController Source; public IController SourceOr; @@ -126,7 +124,7 @@ namespace BizHawk.MultiClient public bool IsPressed(string button) { return this[button]; } public float GetFloat(string name) { return 0.0f; } //TODO public void UpdateControls(int frame) { } - public bool Autofire { get { return false; } set { } } //TODO: sticky autofire buttons? + public bool this[string button] { get { @@ -330,7 +328,7 @@ namespace BizHawk.MultiClient else return Source; } } - public bool Autofire { get { return false; } set { } } + public ControllerDefinition Type { get { return Curr.Type; } } public bool this[string button] { get { return Curr[button]; } } public bool IsPressed(string button) { return Curr.IsPressed(button); } @@ -381,7 +379,7 @@ namespace BizHawk.MultiClient public bool this[string button] { get { return this.IsPressed(button); } } public float GetFloat(string name) { return Source.GetFloat(name); } public void UpdateControls(int frame) { Source.UpdateControls(frame); } - public bool Autofire { get { return false; } set { } } + public bool IsPressed(string button) { //do we even have a source? @@ -414,7 +412,6 @@ namespace BizHawk.MultiClient public bool IsPressed(string button) { return MyBoolButtons[button]; } public float GetFloat(string name) { return 0; } public void UpdateControls(int frame) { } - public bool Autofire { get { return false; } set { } } //-------- WorkingDictionary MyBoolButtons = new WorkingDictionary();