claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Structs] Fix RomData compare, add RomData equality

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-16 10:52:31 -07:00
parent d58b67f124
commit aac8d5a351
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
SabreTools.Helper/Data/Structs.cs
View File

@@ -6,7 +6,7 @@ namespace SabreTools.Helper
/// <summary> /// <summary>
/// Intermediate struct for holding and processing rom data /// Intermediate struct for holding and processing rom data
/// </summary> /// </summary>
public struct RomData : IComparable public struct RomData : IComparable, IEquatable<RomData>
{ {
public string Manufacturer; public string Manufacturer;
public string System; public string System;
@@ -31,29 +31,28 @@ namespace SabreTools.Helper
{ {
RomData comp = (RomData)obj; RomData comp = (RomData)obj;
if (this.SystemID == comp.SystemID) if (this.Game == comp.Game)
{ {
if (this.SourceID == comp.SourceID) if (this.Name == comp.Name)
{ {
if (this.Game == comp.Game) return (RomTools.IsDuplicate(this, comp) ? 0 : 1);
{
if (this.Name == comp.Name)
{
return (RomTools.IsDuplicate(this, comp) ? 0 : 1);
}
return String.Compare(this.Name, comp.Name);
}
return String.Compare(this.Game, comp.Game);
} }
return this.SourceID - comp.SourceID; return String.Compare(this.Name, comp.Name);
} }
return this.SystemID - comp.SystemID; return String.Compare(this.Game, comp.Game);
} }
catch catch
{ {
return 1; return 1;
} }
} }
public bool Equals(RomData other)
{
return (this.Game == other.Game &&
this.Name == other.Name &&
RomTools.IsDuplicate(this, other));
}
} }
/// <summary> /// <summary>