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

View File

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

View File

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

View File

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

View File

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