diff --git a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs index d37b87a734..3b6a67156a 100644 --- a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs +++ b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs @@ -35,7 +35,6 @@ namespace BizHawk.Client.EmuHawk public string Message; public int X; public int Y; - public bool Alert; public int Anchor; public Color ForeColor; public Color BackGround; @@ -46,7 +45,7 @@ namespace BizHawk.Client.EmuHawk public string FPS { get; set; } public string MT { get; set; } public IBlitterFont MessageFont; - public IBlitterFont AlertFont; + public void Dispose() { @@ -55,7 +54,6 @@ namespace BizHawk.Client.EmuHawk public void Begin(IBlitter blitter) { MessageFont = blitter.GetFontType("MessageFont"); - AlertFont = blitter.GetFontType("AlertFont"); } public System.Drawing.Color FixedMessagesColor { get { return System.Drawing.Color.FromArgb(Global.Config.MessagesColor); } } @@ -144,10 +142,18 @@ namespace BizHawk.Client.EmuHawk messages.Add(new UIMessage { Message = message, ExpireAt = DateTime.Now + TimeSpan.FromSeconds(2) }); } - public void AddGUIText(string message, int x, int y, bool alert, Color BackGround, Color ForeColor, int anchor) + public void AddGUIText(string message, int x, int y, Color backGround, Color foreColor, int anchor) { GlobalWin.DisplayManager.NeedsToPaint = true; - GUITextList.Add(new UIDisplay { Message = message, X = x, Y = y, BackGround = BackGround, ForeColor = ForeColor, Alert = alert, Anchor = anchor }); + GUITextList.Add(new UIDisplay + { + Message = message, + X = x, + Y = y, + BackGround = backGround, + ForeColor = foreColor, + Anchor = anchor + }); } public void ClearGUIText() @@ -197,6 +203,7 @@ namespace BizHawk.Client.EmuHawk { y -= ((line - 1) * 18); } + g.DrawString(messages[i].Message, MessageFont, Color.Black, x + 2, y + 2); g.DrawString(messages[i].Message, MessageFont, FixedMessagesColor, x, y); } @@ -210,12 +217,7 @@ namespace BizHawk.Client.EmuHawk float posy = GetY(g, GUITextList[x].Y, GUITextList[x].Anchor, MessageFont, GUITextList[x].Message); g.DrawString(GUITextList[x].Message, MessageFont, GUITextList[x].BackGround, posx + 2, posy + 2); - //g.DrawString(GUITextList[x].Message, MessageFont, Color.Gray, posx + 1, posy + 1); - - if (GUITextList[x].Alert) - g.DrawString(GUITextList[x].Message, AlertFont, FixedMessagesColor, posx, posy); - else - g.DrawString(GUITextList[x].Message, MessageFont, GUITextList[x].ForeColor, posx, posy); + g.DrawString(GUITextList[x].Message, MessageFont, GUITextList[x].ForeColor, posx, posy); } catch (Exception) { @@ -309,10 +311,10 @@ namespace BizHawk.Client.EmuHawk if (Global.Emulator.IsLagFrame) { - float x = GetX(g, Global.Config.DispLagx, Global.Config.DispLaganchor, AlertFont, counter); - float y = GetY(g, Global.Config.DispLagy, Global.Config.DispLaganchor, AlertFont, counter); - g.DrawString(counter, AlertFont, Color.Black, x + 1, y + 1); - g.DrawString(counter, AlertFont, FixedAlertMessageColor, x, y); + float x = GetX(g, Global.Config.DispLagx, Global.Config.DispLaganchor, MessageFont, counter); + float y = GetY(g, Global.Config.DispLagy, Global.Config.DispLaganchor, MessageFont, counter); + g.DrawString(counter, MessageFont, Color.Black, x + 1, y + 1); + g.DrawString(counter, MessageFont, FixedAlertMessageColor, x, y); } else { diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs index 4c48744e13..abc68a24a0 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs @@ -520,7 +520,7 @@ namespace BizHawk.Client.EmuHawk x *= EmuHawkLuaLibrary.GetWindowSize(); y *= EmuHawkLuaLibrary.GetWindowSize(); - GlobalWin.OSD.AddGUIText(message, x, y, false, GetColor(background ?? "black"), GetColor(forecolor ?? "white"), a); + GlobalWin.OSD.AddGUIText(message, x, y, GetColor(background ?? "black"), GetColor(forecolor ?? "white"), a); } } } diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index 67860558a3..c16414d210 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -208,16 +208,15 @@ namespace BizHawk.Client.EmuHawk if (Global.Config.DisplayRamWatch) { - for (var x = 0; x < _watches.Count; x++) + for (var i = 0; i < _watches.Count; i++) { - var alert = !_watches[x].IsSeparator && Global.CheatList.IsActive(_watches[x].Domain, _watches[x].Address ?? 0); + var frozen = !_watches[i].IsSeparator && Global.CheatList.IsActive(_watches[i].Domain, _watches[i].Address ?? 0); GlobalWin.OSD.AddGUIText( - _watches[x].ToString(), + _watches[i].ToString(), Global.Config.DispRamWatchx, - Global.Config.DispRamWatchy + (x * 14), - alert, + Global.Config.DispRamWatchy + (i * 14), Color.Black, - Color.White, + frozen ? Color.Cyan : Color.White, 0 ); }