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

Adjustment to height settings of osd messages, code clean up in movie.cs

This commit is contained in:
adelikat 2012-04-16 12:17:25 +00:00
parent 35fbe354c1
commit 3bae8da0b6
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.MultiClient/Config.cs
View File

@ -177,19 +177,19 @@ namespace BizHawk.MultiClient
public int DispFPSanchor = 0; //0 = UL, 1 = UR, 2 = DL, 3 = DR
public bool DisplayFrameCounter = false;
public int DispFrameCx = 0;
public int DispFrameCy = 12;
public int DispFrameCy = 14;
public int DispFrameanchor = 0;
public bool DisplayLagCounter = false;
public int DispLagx = 0;
public int DispLagy = 36;
public int DispLagy = 42;
public int DispLaganchor = 0;
public bool DisplayInput = false;
public int DispInpx = 0;
public int DispInpy = 24;
public int DispInpy = 28;
public int DispInpanchor = 0;
public bool DisplayRerecordCount = false;
public int DispRecx = 0;
public int DispRecy = 48;
public int DispRecy = 56;
public int DispRecanchor = 0;
public int DispMultix = 36;
public int DispMultiy = 0;
@ -197,7 +197,7 @@ namespace BizHawk.MultiClient
public bool DisplayGDI = false;
public bool DisplayStatusBar = true;
public int DispRamWatchx = 0;
public int DispRamWatchy = 60;
public int DispRamWatchy = 70;
public bool DisplayRamWatch = false;
public bool ShowMenuInFullscreen = false;

4
BizHawk.MultiClient/DisplayManager/DisplayManager.cs
View File

@ -206,8 +206,8 @@ namespace BizHawk.MultiClient
{
//MessageFont = new Font(Device, 16, 0, FontWeight.Bold, 1, false, CharacterSet.Default, Precision.Default, FontQuality.Default, PitchAndFamily.Default | PitchAndFamily.DontCare, "Courier");
//AlertFont = new Font(Device, 16, 0, FontWeight.ExtraBold, 1, true, CharacterSet.Default, Precision.Default, FontQuality.Default, PitchAndFamily.Default | PitchAndFamily.DontCare, "Courier");
MessageFont = new Font("Courier", 16, FontStyle.Bold, GraphicsUnit.Pixel);
AlertFont = new Font("Courier", 16, FontStyle.Bold, GraphicsUnit.Pixel);
MessageFont = new Font("Courier", 14, FontStyle.Bold, GraphicsUnit.Pixel);
AlertFont = new Font("Courier", 14, FontStyle.Bold, GraphicsUnit.Pixel);
}
private float GetX(Graphics g, int x, int anchor, Font font, string message)

5
BizHawk.MultiClient/movie/Movie.cs
View File

@ -341,7 +341,6 @@ namespace BizHawk.MultiClient
for (int x = 0; x < Log.Length(); x++)
writer.WriteLine(Log.GetFrame(x));
writer.WriteLine("[/Input]");
//Global.RenderPanel.AddMessage(Log.Length().ToString() + " frames saved"); //Debug
}
public void LoadLogFromSavestateText(string path)
@ -357,7 +356,6 @@ namespace BizHawk.MultiClient
MakeBackup = false;
}
Log.Clear();
int i = 0; //TODO: Debug remove me
while (true)
{
string line = reader.ReadLine();
@ -390,10 +388,8 @@ namespace BizHawk.MultiClient
if (line[0] == '|')
{
Log.AddFrame(line);
i++;
}
}
//Global.RenderPanel.AddMessage(i.ToString() + " input frames loaded."); //TODO: Remove debug
}
else
{
@ -429,7 +425,6 @@ namespace BizHawk.MultiClient
i++;
}
}
//Global.RenderPanel.AddMessage(i.ToString() + " input frames loaded."); //TODO: Remove debug
}
if (stateFrame > 0 && stateFrame < Log.Length())
{

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

@ -80,7 +80,7 @@ namespace BizHawk.MultiClient
{
bool alert = Global.CheatList.IsActiveCheat(Domain, watchList[x].address);
Global.OSD.AddGUIText(watchList[x].ToString(),
Global.Config.DispRamWatchx, (Global.Config.DispRamWatchy + (x * 12)), alert, 0);
Global.Config.DispRamWatchx, (Global.Config.DispRamWatchy + (x * 14)), alert, 0);
}
}