From 32a1fba5c0a189aaaa68df074a3b88aa8cc42449 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 18 May 2014 16:47:19 +0000 Subject: [PATCH] rip out legacy board properties stuff --- BizHawk.Client.Common/movie/HeaderKeys.cs | 3 --- BizHawk.Client.Common/movie/IMovieHeader.cs | 1 - BizHawk.Client.Common/movie/MovieHeader.cs | 24 +-------------------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/BizHawk.Client.Common/movie/HeaderKeys.cs b/BizHawk.Client.Common/movie/HeaderKeys.cs index 29445cb01e..4ca50f458a 100644 --- a/BizHawk.Client.Common/movie/HeaderKeys.cs +++ b/BizHawk.Client.Common/movie/HeaderKeys.cs @@ -31,9 +31,6 @@ namespace BizHawk.Client.Common // Plugin Settings public const string VIDEOPLUGIN = "VideoPlugin"; - // Board properties - public const string BOARDPROPERTIES = "BoardProperty"; - public static bool Contains(string val) { return typeof(HeaderKeys) diff --git a/BizHawk.Client.Common/movie/IMovieHeader.cs b/BizHawk.Client.Common/movie/IMovieHeader.cs index a04c32413a..ac1e81e37a 100644 --- a/BizHawk.Client.Common/movie/IMovieHeader.cs +++ b/BizHawk.Client.Common/movie/IMovieHeader.cs @@ -5,7 +5,6 @@ namespace BizHawk.Client.Common public interface IMovieHeader : IDictionary { SubtitleList Subtitles { get; } - Dictionary BoardProperties { get; } List Comments { get; } ulong Rerecords { get; set; } diff --git a/BizHawk.Client.Common/movie/MovieHeader.cs b/BizHawk.Client.Common/movie/MovieHeader.cs index e917175f38..fb889051e1 100644 --- a/BizHawk.Client.Common/movie/MovieHeader.cs +++ b/BizHawk.Client.Common/movie/MovieHeader.cs @@ -9,7 +9,6 @@ namespace BizHawk.Client.Common { Comments = new List(); Subtitles = new SubtitleList(); - BoardProperties = new Dictionary(); this[HeaderKeys.EMULATIONVERSION] = VersionInfo.GetEmuVersion(); this[HeaderKeys.MOVIEVERSION] = HeaderKeys.MovieVersion1; @@ -20,7 +19,6 @@ namespace BizHawk.Client.Common } public List Comments { get; private set; } - public Dictionary BoardProperties { get; private set; } public SubtitleList Subtitles { get; private set; } public string SavestateBinaryBase64Blob @@ -154,7 +152,6 @@ namespace BizHawk.Client.Common public new void Clear() { - BoardProperties.Clear(); Comments.Clear(); Subtitles.Clear(); base.Clear(); @@ -173,17 +170,6 @@ namespace BizHawk.Client.Common .AppendLine(); } - foreach (var kvp in BoardProperties) - { - sb - .Append(HeaderKeys.BOARDPROPERTIES) - .Append(' ') - .Append(kvp.Key) - .Append(' ') - .Append(kvp.Value) - .AppendLine(); - } - sb.Append(Subtitles); Comments.ForEach(comment => sb.AppendLine(comment)); @@ -196,15 +182,7 @@ namespace BizHawk.Client.Common { var splitLine = line.Split(new[] { ' ' }, 2); - if (line.Contains(HeaderKeys.BOARDPROPERTIES)) - { - var boardSplit = splitLine[1].Split(' '); - if (!BoardProperties.ContainsKey(boardSplit[0])) - { - BoardProperties.Add(boardSplit[0], boardSplit[1]); - } - } - else if (HeaderKeys.Contains(splitLine[0]) && !this.ContainsKey(splitLine[0])) + if (HeaderKeys.Contains(splitLine[0]) && !this.ContainsKey(splitLine[0])) { Add(splitLine[0], splitLine[1]); }