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

Fix filtering, merging, blanks, and bucketing

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-31 15:33:05 -07:00
parent a70dc3bad6
commit 58039f5093
9 changed files with 137 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SabreTools.Library/DatItems/Machine.cs
View File

@@ -85,7 +85,7 @@ namespace SabreTools.Library.DatItems
/// </summary>
[JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore)]
[JsonConverter(typeof(StringEnumConverter))]
public MachineType MachineType { get; set; } = MachineType.NULL;
public MachineType MachineType { get; set; } = 0x0;
#endregion
@@ -740,9 +740,9 @@ namespace SabreTools.Library.DatItems
return false;
// Machine_Type
if (filter.Machine_Type.MatchesPositive(MachineType.NULL, MachineType) == false)
if (filter.Machine_Type.MatchesPositive(0x0, MachineType) == false)
return false;
if (filter.Machine_Type.MatchesNegative(MachineType.NULL, MachineType) == true)
if (filter.Machine_Type.MatchesNegative(0x0, MachineType) == true)
return false;
#endregion
@@ -1501,7 +1501,7 @@ namespace SabreTools.Library.DatItems
SampleOf = null;
if (fields.Contains(Field.Machine_Type))
MachineType = MachineType.NULL;
MachineType = 0x0;
#endregion