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

Messages - oops, use the Multitrack position settings for multitrack instead of fps, also set better defaults for multi-track message positioning (to not clash with other defaults)

This commit is contained in:
adelikat 2012-12-27 18:33:41 +00:00
parent 99221b51cc
commit fb14e1df1c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.MultiClient/Config.cs
View File

@ -298,9 +298,9 @@ namespace BizHawk.MultiClient
public int DispRecx = 0; public int DispRecx = 0;
public int DispRecy = 56; public int DispRecy = 56;
public int DispRecanchor = 0; public int DispRecanchor = 0;
public int DispMultix = 36; public int DispMultix = 0;
public int DispMultiy = 0; public int DispMultiy = 14;
public int DispMultianchor = 0; public int DispMultianchor = 1;
public bool DisplayGDI = false; public bool DisplayGDI = false;
public bool SuppressGui = false; public bool SuppressGui = false;
public bool DisplayStatusBar = true; public bool DisplayStatusBar = true;

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

@ -523,12 +523,12 @@ namespace BizHawk.MultiClient
} }
if (Global.MovieSession.MultiTrack.IsActive) if (Global.MovieSession.MultiTrack.IsActive)
{ {
float x = GetX(g, Global.Config.DispMultix, Global.Config.DispMultianchor, MessageFont, MT);
float y = GetY(g, Global.Config.DispMultiy, Global.Config.DispMultianchor, MessageFont, MT);
g.DrawString(MT, MessageFont, Color.Black, g.DrawString(MT, MessageFont, Color.Black,
Global.Config.DispFPSx + 1, //TODO: Multitrack position variables x + 1, y + 1);
Global.Config.DispFPSy + 1);
g.DrawString(MT, MessageFont, FixedMessagesColor, g.DrawString(MT, MessageFont, FixedMessagesColor,
Global.Config.DispFPSx, //TODO: Multitrack position variables x, y);
Global.Config.DispFPSy);
} }
if (Global.Config.DisplayFPS && FPS != null) if (Global.Config.DisplayFPS && FPS != null)
{ {

6
BizHawk.MultiClient/config/MessageConfig.cs
View File

@ -457,8 +457,8 @@ namespace BizHawk.MultiClient
Global.Config.DispInpy = 24; Global.Config.DispInpy = 24;
Global.Config.DispRecx = 0; Global.Config.DispRecx = 0;
Global.Config.DispRecy = 48; Global.Config.DispRecy = 48;
Global.Config.DispMultix = 36; Global.Config.DispMultix = 0;
Global.Config.DispMultiy = 0; Global.Config.DispMultiy = 14;
Global.Config.DispMessagex = 3; Global.Config.DispMessagex = 3;
Global.Config.DispMessagey = 0; Global.Config.DispMessagey = 0;
Global.Config.DispAutoholdx = 0; Global.Config.DispAutoholdx = 0;
@ -484,7 +484,7 @@ namespace BizHawk.MultiClient
Global.Config.DispLaganchor = 0; Global.Config.DispLaganchor = 0;
Global.Config.DispInpanchor = 0; Global.Config.DispInpanchor = 0;
Global.Config.DispRecanchor = 0; Global.Config.DispRecanchor = 0;
Global.Config.DispMultianchor = 0; Global.Config.DispMultianchor = 1;
Global.Config.DispMessageanchor = 2; Global.Config.DispMessageanchor = 2;
Global.Config.DispAutoholdanchor = 1; Global.Config.DispAutoholdanchor = 1;