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

New Ram WAtch - implement Display Watches on Screen feature

This commit is contained in:
adelikat 2013-09-08 15:58:01 +00:00
parent 8d4a8bc869
commit 440185a229
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BizHawk.MultiClient/tools/Watch/NewRamWatch.cs
View File

@ -59,14 +59,19 @@ namespace BizHawk.MultiClient
if (Global.Config.DisplayRamWatch)
{
/* TODO
for (int x = 0; x < Watches.Count; x++)
{
bool alert = Global.CheatList.IsActiveCheat(Domain, Watches[x].Address);
Global.OSD.AddGUIText(Watches[x].ToString(),
Global.Config.DispRamWatchx, (Global.Config.DispRamWatchy + (x * 14)), alert, Color.Black, Color.White, 0);
bool alert = Watches[x].IsSeparator ? false : Global.CheatList.IsActiveCheat(Watches[x].Domain, Watches[x].Address.Value);
Global.OSD.AddGUIText(
Watches[x].ToString(),
Global.Config.DispRamWatchx,
(Global.Config.DispRamWatchy + (x * 14)),
alert,
Color.Black,
Color.White,
0
);
}
*/
}
if (!IsHandleCreated || IsDisposed) return;

38
BizHawk.MultiClient/tools/Watch/Watch.cs
View File

@ -294,11 +294,7 @@ namespace BizHawk.MultiClient
public override string ToString()
{
switch (Type)
{
default:
return Value.ToString(); //TODO
}
return "----";
}
public override bool IsSeparator
@ -347,11 +343,7 @@ namespace BizHawk.MultiClient
public override string ToString()
{
switch (Type)
{
default:
return Value.ToString(); //TODO - this is used by on screen display
}
return AddressString + ": " + ValueString;
}
public override bool IsSeparator
@ -404,6 +396,11 @@ namespace BizHawk.MultiClient
_previous = _value = GetByte();
}
public override string ToString()
{
return Notes + ": " + ValueString;
}
public int ChangeCount { get; private set; }
public void ClearChangeCount() { ChangeCount = 0; }
@ -465,11 +462,7 @@ namespace BizHawk.MultiClient
public override string ToString()
{
switch (Type)
{
default:
return Value.ToString(); //TODO
}
return AddressString + ": " + ValueString;
}
protected string FormatValue(ushort val)
@ -503,6 +496,11 @@ namespace BizHawk.MultiClient
_previous = _value = GetWord();
}
public override string ToString()
{
return Notes + ": " + ValueString;
}
public int ChangeCount { get; private set; }
public void ClearChangeCount() { ChangeCount = 0; }
@ -564,11 +562,7 @@ namespace BizHawk.MultiClient
public override string ToString()
{
switch (Type)
{
default:
return Value.ToString(); //TODO
}
return AddressString + ": " + ValueString;
}
protected string FormatValue(uint val)
@ -604,6 +598,10 @@ namespace BizHawk.MultiClient
_previous = _value = GetDWord();
}
public override string ToString()
{
return Notes + ": " + ValueString;
}
public int ChangeCount { get; private set; }
public void ClearChangeCount() { ChangeCount = 0; }