Fix BSP packed files being treated correctly in the map filter

This commit is contained in:
MathiasL 2022-05-08 17:09:46 +02:00
parent c2d33f1816
commit bce1fa13fa
2 changed files with 29 additions and 3 deletions

View file

@ -196,11 +196,11 @@ namespace Damage_Calculator
continue; continue;
// Filter file existence // Filter file existence
if (map.BspFilePath == null && Globals.Settings.ShowMapsMissingBsp == false) if (!map.HasBspFile && !Globals.Settings.ShowMapsMissingBsp)
continue; continue;
if (map.NavFilePath == null && Globals.Settings.ShowMapsMissingNav == false) if (!map.HasNavFile && !Globals.Settings.ShowMapsMissingNav)
continue; continue;
if (map.AinFilePath == null && Globals.Settings.ShowMapsMissingAin == false) if (!map.HasAinFile && !Globals.Settings.ShowMapsMissingAin)
continue; continue;
newMap.Tag = map; newMap.Tag = map;

View file

@ -190,6 +190,32 @@ namespace Shared.Models
} }
} }
/// <summary>
/// Gets whether this map has a NAV file associated with it.
/// Will only account for BSP-packed NAV file after calling parseBspData().
/// </summary>
public bool HasNavFile
{
get => this.BspFilePath != null || this.NavFileBspPacked;
}
/// <summary>
/// Gets whether this map has a AIN file associated with it.
/// Will only account for BSP-packed AIN file after calling parseBspData().
/// </summary>
public bool HasAinFile
{
get => this.AinFilePath != null || this.AinFileBspPacked;
}
/// <summary>
/// Gets whether this map has a BSP map file associated with it.
/// </summary>
public bool HasBspFile
{
get => this.BspFilePath != null;
}
public List<PlayerSpawn> SpawnPoints { get; set; } = new List<PlayerSpawn>(); public List<PlayerSpawn> SpawnPoints { get; set; } = new List<PlayerSpawn>();
public NavMesh? NavMesh { get; set; } public NavMesh? NavMesh { get; set; }