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

Console lua library functions - check if LuaConsole is loaded on these calls. Currently the console should always be open if a script is being called but this is a preparation commit to eventually support running lua scripts without the lua console loaded

This commit is contained in:
adelikat 2017-05-23 13:05:36 -05:00
parent 4919fc5182
commit 770f27dfd4
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
View File

@ -21,7 +21,10 @@ namespace BizHawk.Client.EmuHawk
[LuaMethodAttributes("clear", "clears the output box of the Lua Console window")] [LuaMethodAttributes("clear", "clears the output box of the Lua Console window")]
public static void Clear() public static void Clear()
{ {
GlobalWin.Tools.LuaConsole.ClearOutputWindow(); if (GlobalWin.Tools.Has<LuaConsole>())
{
GlobalWin.Tools.LuaConsole.ClearOutputWindow();
}
} }
[LuaMethodAttributes("getluafunctionslist", "returns a list of implemented functions")] [LuaMethodAttributes("getluafunctionslist", "returns a list of implemented functions")]
@ -39,19 +42,28 @@ namespace BizHawk.Client.EmuHawk
[LuaMethodAttributes("log", "Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable")] [LuaMethodAttributes("log", "Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable")]
public static void Log(params object[] outputs) public static void Log(params object[] outputs)
{ {
LogWithSeparator("\t", "\n", outputs); if (GlobalWin.Tools.Has<LuaConsole>())
{
LogWithSeparator("\t", "\n", outputs);
}
} }
//// Single param version is used by logOutputCallback of some libraries. //// Single param version is used by logOutputCallback of some libraries.
public static void LogOutput(object output) public static void LogOutput(object output)
{ {
Log(output); if (GlobalWin.Tools.Has<LuaConsole>())
{
Log(output);
}
} }
[LuaMethodAttributes("writeline", "Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable")] [LuaMethodAttributes("writeline", "Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable")]
public static void WriteLine(params object[] outputs) public static void WriteLine(params object[] outputs)
{ {
LogWithSeparator("\n", "\n", outputs); if (GlobalWin.Tools.Has<LuaConsole>())
{
LogWithSeparator("\n", "\n", outputs);
}
} }
[LuaMethodAttributes("write", "Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable")] [LuaMethodAttributes("write", "Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable")]
@ -63,6 +75,11 @@ namespace BizHawk.Client.EmuHawk
// Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable // Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable
private static void LogWithSeparator(string separator, string terminator, params object[] outputs) private static void LogWithSeparator(string separator, string terminator, params object[] outputs)
{ {
if (!GlobalWin.Tools.Has<LuaConsole>())
{
return;
}
if (outputs == null) if (outputs == null)
{ {
GlobalWin.Tools.LuaConsole.WriteToOutputWindow("(no return)" + terminator); GlobalWin.Tools.LuaConsole.WriteToOutputWindow("(no return)" + terminator);