diff --git a/DATabase/Generate.cs b/DATabase/Generate.cs index 244dff23..e6fd4fa3 100644 --- a/DATabase/Generate.cs +++ b/DATabase/Generate.cs @@ -255,8 +255,8 @@ JOIN checksums // If we're in a merged mode, merge and then resort by the correct parameters if (merged) { - roms = Sort.Merge(roms, true); - Sort.RomSort(roms, _norename); + roms = Sorting.RomMerge(roms, true); + Sorting.RomSort(roms, _norename); } // Now check rename within games diff --git a/SabreHelper/SabreHelper.csproj b/SabreHelper/SabreHelper.csproj index 635c79cb..8785088d 100644 --- a/SabreHelper/SabreHelper.csproj +++ b/SabreHelper/SabreHelper.csproj @@ -76,7 +76,7 @@ - + diff --git a/SabreHelper/Sort.cs b/SabreHelper/Sorting.cs similarity index 86% rename from SabreHelper/Sort.cs rename to SabreHelper/Sorting.cs index 6c6cbe94..042366b5 100644 --- a/SabreHelper/Sort.cs +++ b/SabreHelper/Sorting.cs @@ -3,9 +3,15 @@ using System.Collections.Generic; namespace SabreTools.Helper { - public class Sort + public class Sorting { - public static List Merge(List inroms, bool presorted = false) + /// + /// Merge an arbitrary set of ROMs based on the supplied information + /// + /// List of RomData objects representing the roms to be merged + /// True if the list should be considered pre-sorted (default false) + /// A List of RomData objects representing the merged roms + public static List RomMerge(List inroms, bool presorted = false) { List outroms = new List();