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

Broken attempt to make frame counter color a variable

This commit is contained in:
andres.delikat 2011-04-21 23:11:06 +00:00
parent df1e1a1930
commit d75b99b010
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/Config.cs
View File

@ -38,6 +38,7 @@
public bool RewindEnabled = true;
// Display options
public int MessagesColor = -1;
public bool DisplayFPS = false;
public int DispFPSx = 0;
public int DispFPSy = 0;

12
BizHawk.MultiClient/RenderPanel.cs
View File

@ -120,7 +120,6 @@ namespace BizHawk.MultiClient
public void Render(IVideoProvider video)
{
Color BackgroundColor = Color.FromArgb(video.BackgroundColor);
int[] data = video.GetVideoBuffer();
Bitmap bmp = new Bitmap(video.BufferWidth, video.BufferHeight, PixelFormat.Format32bppArgb);
@ -258,8 +257,12 @@ namespace BizHawk.MultiClient
{
//TODO: If movie loaded use that frame counter, and also display total movie frame count if read-only
if (Global.Config.DisplayFrameCounter)
MessageFont.DrawString(null, MakeFrameCounter(), Global.Config.DispFrameCx, Global.Config.DispFrameCy, new Color4(Color.White)); //TODO: Allow user to set screen coordinates?
{
//MessageFont.DrawString(null, MakeFrameCounter(), Global.Config.DispFrameCx+2,
// Global.Config.DispFrameCy+2, new Color4(Color.Black));
MessageFont.DrawString(null, MakeFrameCounter(), Global.Config.DispFrameCx,
Global.Config.DispFrameCy, Color.FromArgb(Global.Config.MessagesColor));
}
if (Global.Config.DisplayInput)
{
string input = MakeInputDisplay();
@ -274,7 +277,8 @@ namespace BizHawk.MultiClient
{
if (Global.MainForm.InputLog.GetMovieMode() == MOVIEMODE.PLAY) //TODO: use user movie not input log (input log will never be allowed to be played back)
{
return Global.Emulator.Frame.ToString() + " " + Global.MainForm.InputLog.lastLog.ToString() + "/" + Global.MainForm.InputLog.GetMovieLength().ToString();
return Global.Emulator.Frame.ToString() + " " + Global.MainForm.InputLog.lastLog.ToString()
+ "/" + Global.MainForm.InputLog.GetMovieLength().ToString();
}
else
{