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

active controls should be set to a null emulator as an option too (this still doesn't fix the crash on load though as it never gets to the code that sets active controls because that is triggered by the loading of a ROM)

This commit is contained in:
andres.delikat 2011-05-08 13:43:53 +00:00
parent 3ac209217c
commit a5bf181621
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs
View File

@ -7,7 +7,7 @@ namespace BizHawk
public class NullEmulator : IEmulator, IVideoProvider, ISoundProvider
{
public string SystemId { get { return "NULL"; } }
private static readonly ControllerDefinition NullController = new ControllerDefinition { Name = "Null Controller" };
public static readonly ControllerDefinition NullController = new ControllerDefinition { Name = "Null Controller" };
private int[] frameBuffer = new int[256 * 192];
private Random rand = new Random();

1
BizHawk.MultiClient/Global.cs
View File

@ -20,5 +20,6 @@ namespace BizHawk.MultiClient
public static Controller TI83Controls;
public static Controller NESControls;
public static Controller ActiveController;
public static Controller NullControls;
}
}

4
BizHawk.MultiClient/MainForm.cs
View File

@ -329,6 +329,9 @@ namespace BizHawk.MultiClient
Global.ClientControls = controls;
Global.NullControls = new Controller(NullEmulator.NullController);
var smsControls = new Controller(SMS.SmsController);
smsControls.BindMulti("Reset", Global.Config.SmsReset);
smsControls.BindMulti("Pause", Global.Config.SmsPause);
@ -529,6 +532,7 @@ namespace BizHawk.MultiClient
case "GB":
break;
default:
Global.ActiveController = Global.NullControls;
break;
}
Global.Emulator.Controller = Global.ActiveController;