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] Rename Rom field "Game" to "Machine"

Browse Source
This commit is contained in:
Matt Nadareski
2016-08-29 13:42:27 -07:00
parent 5c0b5bfcbb
commit 19a210562e
8 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SabreTools.Helper/Tools/RomTools.cs
View File

@@ -147,7 +147,7 @@ namespace SabreTools.Helper
{
savedrom.Metadata.SystemID = rom.Metadata.SystemID;
savedrom.Metadata.System = rom.Metadata.System;
savedrom.Game.Name = rom.Game.Name;
savedrom.Machine.Name = rom.Machine.Name;
savedrom.Name = rom.Name;
}
@@ -156,7 +156,7 @@ namespace SabreTools.Helper
{
savedrom.Metadata.SourceID = rom.Metadata.SourceID;
savedrom.Metadata.Source = rom.Metadata.Source;
savedrom.Game.Name = rom.Game.Name;
savedrom.Machine.Name = rom.Machine.Name;
savedrom.Name = rom.Name;
}
@@ -287,7 +287,7 @@ namespace SabreTools.Helper
// If the duplicate is external already or should be, set it
if (lastrom.Dupe >= DupeType.ExternalHash || lastrom.Metadata.SystemID != rom.Metadata.SystemID || lastrom.Metadata.SourceID != rom.Metadata.SourceID)
{
if (lastrom.Game.Name == rom.Game.Name && lastrom.Name == rom.Name)
if (lastrom.Machine.Name == rom.Machine.Name && lastrom.Name == rom.Name)
{
output = DupeType.ExternalAll;
}
@@ -300,7 +300,7 @@ namespace SabreTools.Helper
// Otherwise, it's considered an internal dupe
else
{
if (lastrom.Game.Name == rom.Game.Name && lastrom.Name == rom.Name)
if (lastrom.Machine.Name == rom.Machine.Name && lastrom.Name == rom.Name)
{
output = DupeType.InternalAll;
}
@@ -327,15 +327,15 @@ namespace SabreTools.Helper
{
if (x.Metadata.SourceID == y.Metadata.SourceID)
{
if (x.Game.Name == y.Game.Name)
if (x.Machine.Name == y.Machine.Name)
{
return String.Compare(x.Name, y.Name);
}
return String.Compare(x.Game.Name, y.Game.Name);
return String.Compare(x.Machine.Name, y.Machine.Name);
}
return (norename ? String.Compare(x.Game.Name, y.Game.Name) : x.Metadata.SourceID - y.Metadata.SourceID);
return (norename ? String.Compare(x.Machine.Name, y.Machine.Name) : x.Metadata.SourceID - y.Metadata.SourceID);
}
return (norename ? String.Compare(x.Game.Name, y.Game.Name) : x.Metadata.SystemID - y.Metadata.SystemID);
return (norename ? String.Compare(x.Machine.Name, y.Machine.Name) : x.Metadata.SystemID - y.Metadata.SystemID);
});
return true;
}