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

make lua loadstate not trigger impossible callbacks when it runs, so it can actually work without killing the script. there are still other callbacks might not make sense?

This commit is contained in:
goyuken 2012-10-13 12:44:52 +00:00
parent 613e801b22
commit 1793483aa9
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.MultiClient/LuaImplementation.cs
View File

@ -1862,7 +1862,7 @@ namespace BizHawk.MultiClient
if (x < 0 || x > 9)
return;
Global.MainForm.LoadState("QuickLoad" + x.ToString());
Global.MainForm.LoadState("QuickLoad" + x.ToString(), true);
}
public void savestate_save(object lua_input)
@ -1879,7 +1879,7 @@ namespace BizHawk.MultiClient
{
if (lua_input.GetType() == typeof(string))
{
Global.MainForm.LoadStateFile(lua_input.ToString(), Path.GetFileName(lua_input.ToString()));
Global.MainForm.LoadStateFile(lua_input.ToString(), Path.GetFileName(lua_input.ToString()), true);
}
}

36
BizHawk.MultiClient/MainForm.cs
View File

@ -2357,12 +2357,13 @@ namespace BizHawk.MultiClient
/// <summary>
/// Update all tools that are frame dependent like Ram Search before processing
/// </summary>
public void UpdateToolsBefore()
public void UpdateToolsBefore(bool fromLua = false)
{
#if WINDOWS
LuaConsole1.StartLuaDrawing();
if (!fromLua)
LuaConsole1.StartLuaDrawing();
LuaConsole1.LuaImp.FrameRegisterBefore();
#endif
NESNameTableViewer1.UpdateValues();
NESPPU1.UpdateValues();
@ -2377,26 +2378,29 @@ namespace BizHawk.MultiClient
/// <summary>
/// Update all tools that are frame dependent like Ram Search after processing
/// </summary>
public void UpdateToolsAfter()
public void UpdateToolsAfter(bool fromLua = false)
{
#if WINDOWS
LuaConsole1.ResumeScripts(true);
if (!fromLua)
LuaConsole1.ResumeScripts(true);
#endif
RamWatch1.UpdateValues();
RamSearch1.UpdateValues();
HexEditor1.UpdateValues();
//The other tool updates are earlier, TAStudio needs to be later so it can display the latest
//frame of execution in its list view.
TAStudio1.UpdateValues();
SNESGraphicsDebugger1.UpdateToolsAfter();
TraceLogger1.UpdateValues();
#if WINDOWS
LuaConsole1.LuaImp.FrameRegisterAfter();
Global.DisplayManager.PreFrameUpdateLuaSource();
LuaConsole1.EndLuaDrawing();
if (!fromLua)
{
Global.DisplayManager.PreFrameUpdateLuaSource();
LuaConsole1.EndLuaDrawing();
}
#endif
}
@ -2528,7 +2532,7 @@ namespace BizHawk.MultiClient
SaveStateFile(writer, sfd.FileName, false);
}
public void LoadStateFile(string path, string name)
public void LoadStateFile(string path, string name, bool fromLua = false)
{
if (HandleMovieLoadState(path))
{
@ -2550,16 +2554,17 @@ namespace BizHawk.MultiClient
reader.Close();
Global.OSD.ClearGUIText();
UpdateToolsBefore();
UpdateToolsAfter();
UpdateToolsBefore(fromLua);
UpdateToolsAfter(fromLua);
UpdateToolsLoadstate();
Global.OSD.AddMessage("Loaded state: " + name);
LuaConsole1.LuaImp.SavestateRegisterLoad(name);
}
else
Global.OSD.AddMessage("Loadstate error!");
}
public void LoadState(string name)
public void LoadState(string name, bool fromLua = false)
{
string path = PathManager.SaveStatePrefix(Global.Game) + "." + name + ".State";
if (File.Exists(path) == false)
@ -2568,8 +2573,7 @@ namespace BizHawk.MultiClient
return;
}
LoadStateFile(path, name);
LuaConsole1.LuaImp.SavestateRegisterLoad(name);
LoadStateFile(path, name, fromLua);
}
private void LoadStateAs()