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

Simplify machine name filter

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-08 12:59:08 -07:00
parent 7f6507cffb
commit d7f263e824
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -573,22 +573,13 @@ namespace SabreTools.Library.DatItems
#region Common #region Common
// Machine_Name // Machine_Name
bool? machineNameFound = filter.Machine_Name.MatchesPositiveSet(Name); bool passes = filter.PassStringFilter(filter.Machine_Name, Name);
if (filter.IncludeOfInGame) if (filter.IncludeOfInGame)
{ {
machineNameFound |= (filter.Machine_Name.MatchesPositiveSet(CloneOf) == true); passes |= filter.PassStringFilter(filter.Machine_Name, CloneOf);
machineNameFound |= (filter.Machine_Name.MatchesPositiveSet(RomOf) == true); passes |= filter.PassStringFilter(filter.Machine_Name, RomOf);
} }
if (machineNameFound == false) if (!passes)
return false;
machineNameFound = filter.Machine_Name.MatchesNegativeSet(Name);
if (filter.IncludeOfInGame)
{
machineNameFound |= (filter.Machine_Name.MatchesNegativeSet(CloneOf) == true);
machineNameFound |= (filter.Machine_Name.MatchesNegativeSet(RomOf) == true);
}
if (machineNameFound == false)
return false; return false;
// Machine_Comment // Machine_Comment