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

Ram Watch - when drawing watches on screen, use alert font for frozen addresses

This commit is contained in:
adelikat 2012-03-11 00:50:06 +00:00
parent 3687b8d803
commit 635ae613a4
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/LuaImplementation.cs
View File

@ -304,7 +304,7 @@ namespace BizHawk.MultiClient
//---------------------------------------------------- //----------------------------------------------------
public void gui_text(object luaX, object luaY, object luaStr) public void gui_text(object luaX, object luaY, object luaStr)
{ {
Global.RenderPanel.AddGUIText(luaStr.ToString(), LuaInt(luaX), LuaInt(luaY)); Global.RenderPanel.AddGUIText(luaStr.ToString(), LuaInt(luaX), LuaInt(luaY), false);
} }
//---------------------------------------------------- //----------------------------------------------------

18
BizHawk.MultiClient/RenderPanel.cs
View File

@ -111,7 +111,7 @@ namespace BizHawk.MultiClient
void Render(IVideoProvider video); void Render(IVideoProvider video);
bool Resized { get; set; } bool Resized { get; set; }
void AddMessage(string msg); void AddMessage(string msg);
void AddGUIText(string msg, int x, int y); void AddGUIText(string msg, int x, int y, bool alert);
void ClearGUIText(); void ClearGUIText();
string FPS { get; set; } string FPS { get; set; }
string MT { get; set; } string MT { get; set; }
@ -144,7 +144,7 @@ namespace BizHawk.MultiClient
} }
RetainedViewportPanel backingControl; RetainedViewportPanel backingControl;
public void AddMessage(string msg) { } public void AddMessage(string msg) { }
public void AddGUIText(string msg, int x, int y) { } public void AddGUIText(string msg, int x, int y, bool alert) { }
public void ClearGUIText() { } public void ClearGUIText() { }
} }
@ -477,9 +477,9 @@ namespace BizHawk.MultiClient
messages.Add(new UIMessage { Message = message, ExpireAt = DateTime.Now + TimeSpan.FromSeconds(2) }); messages.Add(new UIMessage { Message = message, ExpireAt = DateTime.Now + TimeSpan.FromSeconds(2) });
} }
public void AddGUIText(string message, int x, int y) public void AddGUIText(string message, int x, int y, bool alert)
{ {
GUITextList.Add(new UIDisplay { Message = message, X = x, Y = y }); GUITextList.Add(new UIDisplay { Message = message, X = x, Y = y, Alert = alert });
} }
public void ClearGUIText() public void ClearGUIText()
@ -505,8 +505,13 @@ namespace BizHawk.MultiClient
GUITextList[x].X + 2, GUITextList[x].Y + 2, Color.Black); GUITextList[x].X + 2, GUITextList[x].Y + 2, Color.Black);
MessageFont.DrawString(null, GUITextList[x].Message, MessageFont.DrawString(null, GUITextList[x].Message,
GUITextList[x].X + 1, GUITextList[x].Y + 1, Color.Gray); GUITextList[x].X + 1, GUITextList[x].Y + 1, Color.Gray);
MessageFont.DrawString(null, GUITextList[x].Message,
GUITextList[x].X, GUITextList[x].Y, Color.FromArgb(Global.Config.MessagesColor)); if (GUITextList[x].Alert)
MessageFont.DrawString(null, GUITextList[x].Message,
GUITextList[x].X, GUITextList[x].Y, Color.FromArgb(Global.Config.AlertMessageColor));
else
MessageFont.DrawString(null, GUITextList[x].Message,
GUITextList[x].X, GUITextList[x].Y, Color.FromArgb(Global.Config.MessagesColor));
} }
} }
@ -554,5 +559,6 @@ namespace BizHawk.MultiClient
public DateTime ExpireAt; public DateTime ExpireAt;
public int X; public int X;
public int Y; public int Y;
public bool Alert;
} }
} }

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

@ -78,8 +78,9 @@ namespace BizHawk.MultiClient
Global.RenderPanel.ClearGUIText(); Global.RenderPanel.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);
Global.RenderPanel.AddGUIText(watchList[x].ToString(), Global.RenderPanel.AddGUIText(watchList[x].ToString(),
Global.Config.DispRamWatchx, (Global.Config.DispRamWatchy + (x * 12))); Global.Config.DispRamWatchx, (Global.Config.DispRamWatchy + (x * 12)), alert);
} }
} }