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

Fix when guitext gets cleared, reduces most of the flickering and inconsistencies with ram watch on screen and lua gui.text, fix punchoutstats lua script

This commit is contained in:
adelikat 2012-04-30 01:14:23 +00:00
parent e60ba05e66
commit 54d1c873df
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.MultiClient/LuaImplementation.cs
View File

@ -435,9 +435,9 @@ namespace BizHawk.MultiClient
if (!alert) if (!alert)
{ {
if (forecolor == null) if (forecolor == null)
forecolor = "black"; forecolor = "white";
if (background == null) if (background == null)
background = "white"; background = "black";
} }
int a = 0; int a = 0;
if (anchor != null) if (anchor != null)

4
BizHawk.MultiClient/MainForm.cs
View File

@ -1748,7 +1748,9 @@ namespace BizHawk.MultiClient
if (runFrame) if (runFrame)
{ {
//client input-related duties //client input-related duties
Global.OSD.ClearGUIText(); Global.OSD.ClearGUIText();
UpdateTools();
#if WINDOWS #if WINDOWS
LuaConsole1.ResumeScripts(true); LuaConsole1.ResumeScripts(true);
#endif #endif
@ -1849,7 +1851,7 @@ namespace BizHawk.MultiClient
CurrAviWriter.AddSamples(temp); CurrAviWriter.AddSamples(temp);
} }
UpdateTools();
if (Global.Emulator.IsLagFrame && Global.Config.AutofireLagFrames) if (Global.Emulator.IsLagFrame && Global.Config.AutofireLagFrames)
{ {

2
BizHawk.MultiClient/output/Lua/PunchOutStats.lua
View File

@ -73,7 +73,7 @@ while true do
end end
if OppHitTimer > 0 then if OppHitTimer > 0 then
gui.text(0, 0, "Damage: " .. OppHitToDisplay, "bottomright") gui.text(0, 0, "Damage: " .. OppHitToDisplay, null, null, "bottomright")
end end

1
BizHawk.MultiClient/tools/RamWatch.cs
View File

@ -75,7 +75,6 @@ namespace BizHawk.MultiClient
if (Global.Config.DisplayRamWatch) if (Global.Config.DisplayRamWatch)
{ {
Global.OSD.ClearGUIText();
for (int x = 0; x < watchList.Count; x++) for (int x = 0; x < watchList.Count; x++)
{ {
bool alert = Global.CheatList.IsActiveCheat(Domain, watchList[x].address); bool alert = Global.CheatList.IsActiveCheat(Domain, watchList[x].address);