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

Lua - simplify some logic

This commit is contained in:
adelikat 2019-11-29 12:47:50 -06:00
parent 84d9419637
commit de2da910c2
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,20 +209,20 @@ namespace BizHawk.Client.EmuHawk
_lua.Pop(); _lua.Pop();
} }
public ResumeResult ResumeScript(Lua script) public override ResumeResult ResumeScript(LuaFile lf)
{ {
_currThread = script; _currThread = lf.Thread;
try try
{ {
LuaLibraryBase.SetCurrentThread(_currThread); LuaLibraryBase.SetCurrentThread(_currThread);
var execResult = script.Resume(0); var execResult = _currThread.Resume(0);
_lua.RunScheduledDisposes(); _lua.RunScheduledDisposes();
// not sure how this is going to work out, so do this too // not sure how this is going to work out, so do this too
script.RunScheduledDisposes(); _currThread.RunScheduledDisposes();
_currThread = null; _currThread = null;
var result = new ResumeResult(); var result = new ResumeResult();
@ -246,11 +246,6 @@ namespace BizHawk.Client.EmuHawk
} }
} }
public override ResumeResult ResumeScriptFromThreadOf(LuaFile lf)
{
return ResumeScript(lf.Thread);
}
public static void Print(params object[] outputs) public static void Print(params object[] outputs)
{ {
ConsoleLuaLibrary.Log(outputs); ConsoleLuaLibrary.Log(outputs);

2
BizHawk.Client.EmuHawk/tools/Lua/Libraries/NotReallyLuaLibrary.cs
View File

@ -40,7 +40,7 @@ namespace BizHawk.Client.EmuHawk
{ {
} }
private static readonly EmuLuaLibrary.ResumeResult EmptyResumeResult = new EmuLuaLibrary.ResumeResult(); private static readonly EmuLuaLibrary.ResumeResult EmptyResumeResult = new EmuLuaLibrary.ResumeResult();
public override EmuLuaLibrary.ResumeResult ResumeScriptFromThreadOf(LuaFile lf) public override EmuLuaLibrary.ResumeResult ResumeScript(LuaFile lf)
{ {
return EmptyResumeResult; return EmptyResumeResult;
} }

2
BizHawk.Client.EmuHawk/tools/Lua/Libraries/PlatformEmuLuaLibrary.cs
View File

@ -29,7 +29,7 @@ namespace BizHawk.Client.EmuHawk
public abstract void EndLuaDrawing(); public abstract void EndLuaDrawing();
public abstract void ExecuteString(string command); public abstract void ExecuteString(string command);
public abstract void Restart(IEmulatorServiceProvider newServiceProvider); public abstract void Restart(IEmulatorServiceProvider newServiceProvider);
public abstract EmuLuaLibrary.ResumeResult ResumeScriptFromThreadOf(LuaFile lf); public abstract EmuLuaLibrary.ResumeResult ResumeScript(LuaFile lf);
public abstract void SpawnAndSetFileThread(string pathToLoad, LuaFile lf); public abstract void SpawnAndSetFileThread(string pathToLoad, LuaFile lf);
public abstract void StartLuaDrawing(); public abstract void StartLuaDrawing();
public abstract void WindowClosed(IntPtr handle); public abstract void WindowClosed(IntPtr handle);

2
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -551,7 +551,7 @@ namespace BizHawk.Client.EmuHawk
var prohibit = lf.FrameWaiting && !includeFrameWaiters; var prohibit = lf.FrameWaiting && !includeFrameWaiters;
if (!prohibit) if (!prohibit)
{ {
var result = LuaImp.ResumeScriptFromThreadOf(lf); var result = LuaImp.ResumeScript(lf);
if (result.Terminated) if (result.Terminated)
{ {
LuaImp.CallExitEvent(lf); LuaImp.CallExitEvent(lf);