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

Lua - joypad.setfrommnemonicstr() - catch errors and log to the lua console the error instead of killing the script

This commit is contained in:
adelikat 2014-06-29 13:40:49 +00:00
parent 0c5fda5cb3
commit e475edc3c6
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
View File

@ -73,17 +73,24 @@ namespace BizHawk.Client.Common
)]
public void SetFromMnemonicStr(string inputLogEntry)
{
var lg = Global.MovieSession.MovieControllerInstance();
lg.SetControllersAsMnemonic(inputLogEntry);
foreach (var button in lg.Type.BoolButtons)
try
{
Global.LuaAndAdaptor.SetButton(button, lg.IsPressed(button));
var lg = Global.MovieSession.MovieControllerInstance();
lg.SetControllersAsMnemonic(inputLogEntry);
foreach (var button in lg.Type.BoolButtons)
{
Global.LuaAndAdaptor.SetButton(button, lg.IsPressed(button));
}
foreach (var floatButton in lg.Type.FloatControls)
{
Global.LuaAndAdaptor.SetFloat(floatButton, lg.GetFloat(floatButton));
}
}
foreach (var floatButton in lg.Type.FloatControls)
catch (Exception)
{
Global.LuaAndAdaptor.SetFloat(floatButton, lg.GetFloat(floatButton));
Log("invalid mnemonic string: " + inputLogEntry);
}
}