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

Sub items should not check types

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-30 13:25:40 -07:00
parent d82a911cd9
commit 7fc49203f4
24 changed files with 302 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
SabreTools.Library/DatItems/Device.cs
View File

@@ -109,7 +109,7 @@ namespace SabreTools.Library.DatItems
if (mappings.Keys.Contains(Field.DatItem_Interface))
Interface = mappings[Field.DatItem_Interface];
if (Instances != null)
if (InstancesSpecified)
{
foreach (Instance instance in Instances)
{
@@ -117,7 +117,7 @@ namespace SabreTools.Library.DatItems
}
}
if (Extensions != null)
if (ExtensionsSpecified)
{
foreach (Extension extension in Extensions)
{
@@ -186,7 +186,7 @@ namespace SabreTools.Library.DatItems
return match;
// If the instances match
if (Instances != null)
if (InstancesSpecified)
{
foreach (Instance instance in Instances)
{
@@ -195,7 +195,7 @@ namespace SabreTools.Library.DatItems
}
// If the extensions match
if (Extensions != null)
if (ExtensionsSpecified)
{
foreach (Extension extension in Extensions)
{
@@ -244,21 +244,21 @@ namespace SabreTools.Library.DatItems
return false;
// Filter on individual instances
if (Instances != null)
if (InstancesSpecified)
{
foreach (Instance instance in Instances)
{
if (!instance.PassesFilter(filter))
if (!instance.PassesFilter(filter, true))
return false;
}
}
// Filter on individual extensions
if (Extensions != null)
if (ExtensionsSpecified)
{
foreach (Extension extension in Extensions)
{
if (!extension.PassesFilter(filter))
if (!extension.PassesFilter(filter, true))
return false;
}
}
@@ -291,7 +291,7 @@ namespace SabreTools.Library.DatItems
if (fields.Contains(Field.DatItem_Interface))
Interface = null;
if (Instances != null)
if (InstancesSpecified)
{
foreach (Instance instance in Instances)
{
@@ -299,7 +299,7 @@ namespace SabreTools.Library.DatItems
}
}
if (Extensions != null)
if (ExtensionsSpecified)
{
foreach (Extension extension in Extensions)
{