diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 05af6478ac..df77e2d719 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -297,7 +297,6 @@ - diff --git a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj index 34cc382d59..0be0118c06 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj @@ -311,7 +311,6 @@ - diff --git a/BizHawk.MultiClient/HistoryCollection.cs b/BizHawk.MultiClient/HistoryCollection.cs deleted file mode 100644 index 3fad588818..0000000000 --- a/BizHawk.MultiClient/HistoryCollection.cs +++ /dev/null @@ -1,88 +0,0 @@ -using System.Collections.Generic; -using System.Linq; - -namespace BizHawk.MultiClient -{ - public class HistoryCollection - { - public List> History { get; private set; } - private int curPos; //1-based - public bool Enabled { get; private set; } - - public HistoryCollection(bool enabled) - { - History = new List>(); - Enabled = enabled; - } - - public HistoryCollection(List newState, bool enabled) - { - History = new List>(); - AddState(newState); - Enabled = enabled; - } - - public void Clear() - { - History = new List>(); - } - - public bool CanUndo - { - get { return Enabled && curPos > 1; } - } - - public bool CanRedo - { - get { return Enabled && curPos < History.Count; } - } - - public bool HasHistory - { - get { return Enabled && History.Any(); } - } - - public void AddState(List newState) - { - if (Enabled) - { - if (curPos < History.Count) - { - for (int i = curPos + 1; i <= History.Count; i++) - { - History.Remove(History[i - 1]); - } - } - - History.Add(newState); - curPos = History.Count; - } - } - - public List Undo() - { - if (CanUndo && Enabled) - { - curPos--; - return History[curPos - 1]; - } - else - { - return null; - } - } - - public List Redo() - { - if (CanRedo && Enabled) - { - curPos++; - return History[curPos - 1]; - } - else - { - return null; - } - } - } -} diff --git a/BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs b/BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs index d29903ea79..4bbe754387 100644 --- a/BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs +++ b/BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs @@ -1294,7 +1294,7 @@ this.SearchButton.UseVisualStyleBackColor = true; this.SearchButton.Click += new System.EventHandler(this.SearchMenuItem_Click); // - // NewRamSearch + // RamSearch // this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1313,8 +1313,8 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; this.MinimumSize = new System.Drawing.Size(291, 400); - this.Name = "NewRamSearch"; - this.Text = "Brand New Experimental Ram Search"; + this.Name = "RamSearch"; + this.Text = "Ram Search"; this.Activated += new System.EventHandler(this.NewRamSearch_Activated); this.Load += new System.EventHandler(this.RamSearch_Load); this.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragDrop);