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

Lua - fix emu.registerbefore() and emu.registerafter()

This commit is contained in:
adelikat 2012-10-06 16:13:45 +00:00
parent ba95c5c5fc
commit b8070bc92f
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BizHawk.MultiClient/MainForm.cs
View File

@ -2317,8 +2317,11 @@ namespace BizHawk.MultiClient
/// </summary> /// </summary>
public void UpdateToolsBefore() public void UpdateToolsBefore()
{ {
#if WINDOWS
LuaConsole1.StartLuaDrawing();
LuaConsole1.LuaImp.FrameRegisterBefore(); LuaConsole1.LuaImp.FrameRegisterBefore();
#endif
NESNameTableViewer1.UpdateValues(); NESNameTableViewer1.UpdateValues();
NESPPU1.UpdateValues(); NESPPU1.UpdateValues();
PCEBGViewer1.UpdateValues(); PCEBGViewer1.UpdateValues();
@ -2335,18 +2338,24 @@ namespace BizHawk.MultiClient
public void UpdateToolsAfter() public void UpdateToolsAfter()
{ {
#if WINDOWS #if WINDOWS
LuaConsole1.ResumeScripts(true); LuaConsole1.ResumeScripts(true);
Global.DisplayManager.PreFrameUpdateLuaSource();
#endif #endif
RamWatch1.UpdateValues(); RamWatch1.UpdateValues();
RamSearch1.UpdateValues(); RamSearch1.UpdateValues();
HexEditor1.UpdateValues(); HexEditor1.UpdateValues();
//The other tool updates are earlier, TAStudio needs to be later so it can display the latest //The other tool updates are earlier, TAStudio needs to be later so it can display the latest
//frame of execution in its list view. //frame of execution in its list view.
LuaConsole1.LuaImp.FrameRegisterAfter();
TAStudio1.UpdateValues(); TAStudio1.UpdateValues();
SNESGraphicsDebugger1.UpdateToolsAfter(); SNESGraphicsDebugger1.UpdateToolsAfter();
TraceLogger1.UpdateValues(); TraceLogger1.UpdateValues();
#if WINDOWS
LuaConsole1.LuaImp.FrameRegisterAfter();
Global.DisplayManager.PreFrameUpdateLuaSource();
LuaConsole1.EndLuaDrawing();
#endif
} }
private unsafe Image MakeScreenshotImage() private unsafe Image MakeScreenshotImage()

15
BizHawk.MultiClient/tools/LuaConsole.cs
View File

@ -840,7 +840,10 @@ namespace BizHawk.MultiClient
/// <param name="includeFrameWaiters">should frame waiters be waken up? only use this immediately before a frame of emulation</param> /// <param name="includeFrameWaiters">should frame waiters be waken up? only use this immediately before a frame of emulation</param>
public void ResumeScripts(bool includeFrameWaiters) public void ResumeScripts(bool includeFrameWaiters)
{ {
LuaImp.gui_drawNewEmu(); if (LuaImp.luaSurface == null)
{
LuaImp.gui_drawNewEmu();
}
for (int i = 0; i < luaList.Count; i++) for (int i = 0; i < luaList.Count; i++)
{ {
try try
@ -872,6 +875,16 @@ namespace BizHawk.MultiClient
else MessageBox.Show(ex.ToString()); else MessageBox.Show(ex.ToString());
} }
} }
//LuaImp.gui_drawFinishEmu();
}
public void StartLuaDrawing()
{
LuaImp.gui_drawNewEmu();
}
public void EndLuaDrawing()
{
LuaImp.gui_drawFinishEmu(); LuaImp.gui_drawFinishEmu();
} }