From 80d8b617a5b13aa432af87679bd7d8505f6debc3 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Wed, 15 Feb 2012 19:50:25 +0000
Subject: [PATCH] a little bit of subtitle stuff cleanup, hopefully i didnt
 break anything

---
 BizHawk.MultiClient/movie/MovieImport.cs  | 2 +-
 BizHawk.MultiClient/movie/Subtitle.cs     | 2 +-
 BizHawk.MultiClient/movie/SubtitleList.cs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BizHawk.MultiClient/movie/MovieImport.cs b/BizHawk.MultiClient/movie/MovieImport.cs
index 2e8ba5e2ea..db0b9b2d80 100644
--- a/BizHawk.MultiClient/movie/MovieImport.cs
+++ b/BizHawk.MultiClient/movie/MovieImport.cs
@@ -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;
 		}
 
diff --git a/BizHawk.MultiClient/movie/Subtitle.cs b/BizHawk.MultiClient/movie/Subtitle.cs
index 7a8c9e9999..626e0dcd03 100644
--- a/BizHawk.MultiClient/movie/Subtitle.cs
+++ b/BizHawk.MultiClient/movie/Subtitle.cs
@@ -12,7 +12,7 @@ namespace BizHawk.MultiClient
 		public int X;
 		public int Y;
 		public int Duration;
-		public UInt32 Color;
+		public uint Color;
 
 		public Subtitle()
 		{
diff --git a/BizHawk.MultiClient/movie/SubtitleList.cs b/BizHawk.MultiClient/movie/SubtitleList.cs
index 2912dfdd89..be369a0981 100644
--- a/BizHawk.MultiClient/movie/SubtitleList.cs
+++ b/BizHawk.MultiClient/movie/SubtitleList.cs
@@ -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
 			{