diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 29f0595bc4..f69c34cb83 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -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; diff --git a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs index bfffab7472..917f83dd05 100644 --- a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs +++ b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs @@ -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) diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs index 4b14fd0ae7..8852f013ce 100644 --- a/BizHawk.MultiClient/movie/Movie.cs +++ b/BizHawk.MultiClient/movie/Movie.cs @@ -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()) { diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs index 042000a280..9ebbf96046 100644 --- a/BizHawk.MultiClient/tools/RamWatch.cs +++ b/BizHawk.MultiClient/tools/RamWatch.cs @@ -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); } }