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

[DatItem, Machine] Remove direct usage of Machine from DatItem

Browse Source
This commit is contained in:
Matt Nadareski
2017-10-06 17:31:14 -07:00
parent ae01adfc6e
commit dd19501cf3
10 changed files with 582 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
SabreTools.Library/Dats/Filter.cs
View File

@@ -266,24 +266,18 @@ namespace SabreTools.Library.Dats
return false;
}
// If the item's machine is null, we automatically fail it
if (item.Machine == null)
{
return false;
}
// Filter on machine type
if (_machineTypes != MachineType.NULL && (item.Machine.MachineType & _machineTypes) == 0)
if (_machineTypes != MachineType.NULL && (item.MachineType & _machineTypes) == 0)
{
return false;
}
if (_machineNotTypes != MachineType.NULL && (item.Machine.MachineType & _machineNotTypes) != 0)
if (_machineNotTypes != MachineType.NULL && (item.MachineType & _machineNotTypes) != 0)
{
return false;
}
// Filter on machine runability
if (_runnable != null && item.Machine.Runnable != _runnable)
if (_runnable != null && item.Runnable != _runnable)
{
return false;
}
@@ -536,13 +530,13 @@ namespace SabreTools.Library.Dats
// Filter on game name
if (_gameNames.Count > 0)
{
bool found = FindValueInList(_gameNames, item.Machine.Name);
bool found = FindValueInList(_gameNames, item.MachineName);
// If we are checking CloneOf and RomOf, add them in as well
if (_includeOfInGame)
{
found |= FindValueInList(_gameNames, item.Machine.CloneOf);
found |= FindValueInList(_gameNames, item.Machine.RomOf);
found |= FindValueInList(_gameNames, item.CloneOf);
found |= FindValueInList(_gameNames, item.RomOf);
}
// If the game name was not found in the list, return false
@@ -553,13 +547,13 @@ namespace SabreTools.Library.Dats
}
if (_notGameNames.Count > 0)
{
bool found = FindValueInList(_gameNames, item.Machine.Name);
bool found = FindValueInList(_gameNames, item.MachineName);
// If we are checking CloneOf and RomOf, add them in as well
if (_includeOfInGame)
{
found |= FindValueInList(_gameNames, item.Machine.CloneOf);
found |= FindValueInList(_gameNames, item.Machine.RomOf);
found |= FindValueInList(_gameNames, item.CloneOf);
found |= FindValueInList(_gameNames, item.RomOf);
}
// If the game name was found in the list, return false