From 54d1c873df3e80bc25b7256c471d7f44c897f1b7 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 30 Apr 2012 01:14:23 +0000
Subject: [PATCH] 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

---
 BizHawk.MultiClient/LuaImplementation.cs         | 4 ++--
 BizHawk.MultiClient/MainForm.cs                  | 4 +++-
 BizHawk.MultiClient/output/Lua/PunchOutStats.lua | 2 +-
 BizHawk.MultiClient/tools/RamWatch.cs            | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/BizHawk.MultiClient/LuaImplementation.cs b/BizHawk.MultiClient/LuaImplementation.cs
index 99591be5a4..28e93ec7d0 100644
--- a/BizHawk.MultiClient/LuaImplementation.cs
+++ b/BizHawk.MultiClient/LuaImplementation.cs
@@ -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)
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index abd02374b3..b178fffe5d 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -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)
 				{
diff --git a/BizHawk.MultiClient/output/Lua/PunchOutStats.lua b/BizHawk.MultiClient/output/Lua/PunchOutStats.lua
index dc7e9dbaf1..3f6b7a2f8d 100644
--- a/BizHawk.MultiClient/output/Lua/PunchOutStats.lua
+++ b/BizHawk.MultiClient/output/Lua/PunchOutStats.lua
@@ -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
 
     
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index e31fbddc4d..d179ee2046 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -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);