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

a little bit of subtitle stuff cleanup, hopefully i didnt break anything

This commit is contained in:
zeromus 2012-02-15 19:50:25 +00:00
parent 213b347779
commit 80d8b617a5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/movie/MovieImport.cs
View File

@ -87,7 +87,7 @@ namespace BizHawk.MultiClient
// The frame and message are separated by a space.
string frame = sub.Substring(0, x);
string message = sub.Substring(x + 1, sub.Length - x - 1);
m.Subtitles.AddSubtitle("subtitle " + frame + " 0 0 200 16777215 " + message);
m.Subtitles.AddSubtitle("subtitle " + frame + " 0 0 200 FFFFFFFF " + message);
return true;
}

2
BizHawk.MultiClient/movie/Subtitle.cs
View File

@ -12,7 +12,7 @@ namespace BizHawk.MultiClient
public int X;
public int Y;
public int Duration;
public UInt32 Color;
public uint Color;
public Subtitle()
{

4
BizHawk.MultiClient/movie/SubtitleList.cs
View File

@ -47,7 +47,7 @@ namespace BizHawk.MultiClient
sb.Append(" ");
sb.Append(subs[index].Duration.ToString());
sb.Append(" ");
sb.Append(subs[index].Color.ToString());
sb.Append(string.Format("{0:X8}", subs[index].Color));
sb.Append(" ");
sb.Append(subs[index].Message);
return sb.ToString();
@ -172,7 +172,7 @@ namespace BizHawk.MultiClient
str = str.Substring(x + 1, str.Length - x - 1);
try
{
s.Color = uint.Parse(Color);
s.Color = uint.Parse(Color, System.Globalization.NumberStyles.HexNumber);
}
catch
{