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

Lua - sort the functions in the lua function list (both in the console dialog, and console.luafunctionslist())

This commit is contained in:
adelikat 2012-03-28 12:26:43 +00:00
parent f7f4e64985
commit 71396ad4b7
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
BizHawk.MultiClient/LuaImplementation.cs
View File

@ -16,7 +16,7 @@ namespace BizHawk.MultiClient
{
Lua lua = new Lua();
LuaConsole Caller;
public string LuaLibraryList = "";
public List<string> LuaLibraryList = new List<string>();
public EventWaitHandle LuaWait;
public bool isRunning;
private int CurrentMemoryDomain = 0; //Main memory by default
@ -60,7 +60,7 @@ namespace BizHawk.MultiClient
public LuaImplementation(LuaConsole passed)
{
LuaWait = new AutoResetEvent(false);
LuaLibraryList = "";
LuaLibraryList.Clear();
Caller = passed.get();
LuaRegister(lua);
}
@ -79,71 +79,73 @@ namespace BizHawk.MultiClient
for (int i = 0; i < ConsoleFunctions.Length; i++)
{
lua.RegisterFunction("console." + ConsoleFunctions[i], this, this.GetType().GetMethod("console_" + ConsoleFunctions[i]));
LuaLibraryList += "console." + ConsoleFunctions[i] + "\n";
LuaLibraryList.Add("console." + ConsoleFunctions[i]);
}
lua.NewTable("gui");
for (int i = 0; i < GuiFunctions.Length; i++)
{
lua.RegisterFunction("gui." + GuiFunctions[i], this, this.GetType().GetMethod("gui_" + GuiFunctions[i]));
LuaLibraryList += "gui." + GuiFunctions[i] + "\n";
LuaLibraryList.Add("gui." + GuiFunctions[i]);
}
lua.NewTable("emu");
for (int i = 0; i < EmuFunctions.Length; i++)
{
lua.RegisterFunction("emu." + EmuFunctions[i], this, this.GetType().GetMethod("emu_" + EmuFunctions[i]));
LuaLibraryList += "emu." + EmuFunctions[i] + "\n";
LuaLibraryList.Add("emu." + EmuFunctions[i]);
}
lua.NewTable("memory");
for (int i = 0; i < MemoryFunctions.Length; i++)
{
lua.RegisterFunction("memory." + MemoryFunctions[i], this, this.GetType().GetMethod("memory_" + MemoryFunctions[i]));
LuaLibraryList += "memory." + MemoryFunctions[i] + "\n";
LuaLibraryList.Add("memory." + MemoryFunctions[i]);
}
lua.NewTable("mainmemory");
for (int i = 0; i < MainMemoryFunctions.Length; i++)
{
lua.RegisterFunction("mainmemory." + MainMemoryFunctions[i], this, this.GetType().GetMethod("mainmemory_" + MainMemoryFunctions[i]));
LuaLibraryList += "mainmemory." + MainMemoryFunctions[i] + "\n";
LuaLibraryList.Add("mainmemory." + MainMemoryFunctions[i]);
}
lua.NewTable("savestate");
for (int i = 0; i < SaveStateFunctions.Length; i++)
{
lua.RegisterFunction("savestate." + SaveStateFunctions[i], this, this.GetType().GetMethod("savestate_" + SaveStateFunctions[i]));
LuaLibraryList += "savestate." + SaveStateFunctions[i] + "\n";
LuaLibraryList.Add("savestate." + SaveStateFunctions[i]);
}
lua.NewTable("movie");
for (int i = 0; i < MovieFunctions.Length; i++)
{
lua.RegisterFunction("movie." + MovieFunctions[i], this, this.GetType().GetMethod("movie_" + MovieFunctions[i]));
LuaLibraryList += "movie." + MovieFunctions[i] + "\n";
LuaLibraryList.Add("movie." + MovieFunctions[i]);
}
lua.NewTable("input");
for (int i = 0; i < InputFunctions.Length; i++)
{
lua.RegisterFunction("input." + InputFunctions[i], this, this.GetType().GetMethod("input_" + InputFunctions[i]));
LuaLibraryList += "input." + InputFunctions[i] + "\n";
LuaLibraryList.Add("input." + InputFunctions[i]);
}
lua.NewTable("joypad");
for (int i = 0; i < JoypadFunctions.Length; i++)
{
lua.RegisterFunction("joypad." + JoypadFunctions[i], this, this.GetType().GetMethod("joypad_" + JoypadFunctions[i]));
LuaLibraryList += "joypad." + JoypadFunctions[i] + "\n";
LuaLibraryList.Add("joypad." + JoypadFunctions[i]);
}
lua.NewTable("client");
for (int i = 0; i < MultiClientFunctions.Length; i++)
{
lua.RegisterFunction("client." + MultiClientFunctions[i], this, this.GetType().GetMethod("client_" + MultiClientFunctions[i]));
LuaLibraryList += "client." + MultiClientFunctions[i] + "\n";
LuaLibraryList.Add("client." + MultiClientFunctions[i]);
}
LuaLibraryList.Sort();
}
public Lua SpawnCoroutine(string File)
@ -378,7 +380,13 @@ namespace BizHawk.MultiClient
public string console_getluafunctionslist()
{
return LuaLibraryList;
string list = "";
foreach (string l in LuaLibraryList)
{
list += l + "\n";
}
return list;
}
//----------------------------------------------------

7
BizHawk.MultiClient/tools/LuaFunctionList.cs
View File

@ -18,7 +18,12 @@ namespace BizHawk.MultiClient
private void LuaFunctionList_Load(object sender, EventArgs e)
{
FunctionBox.Text = Global.MainForm.LuaConsole1.LuaImp.LuaLibraryList;
FunctionBox.Text = "";
foreach (string l in Global.MainForm.LuaConsole1.LuaImp.LuaLibraryList)
{
FunctionBox.Text += l + "\n";
}
}
private void OK_Click(object sender, EventArgs e)