From b6b7a5e7aae8190517b9e3707a3fae1a348a44f3 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sat, 20 Mar 2021 19:23:59 -0700 Subject: [PATCH] Clean up terminology --- BurnOutSharp/PackerType/WinZipSFX.cs | 24 ++++++++++++------------ BurnOutSharp/ProtectionType/AACS.cs | 8 ++++---- BurnOutSharp/ProtectionType/BDPlus.cs | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/BurnOutSharp/PackerType/WinZipSFX.cs b/BurnOutSharp/PackerType/WinZipSFX.cs index 5d686564..9e8e982e 100644 --- a/BurnOutSharp/PackerType/WinZipSFX.cs +++ b/BurnOutSharp/PackerType/WinZipSFX.cs @@ -144,7 +144,7 @@ namespace BurnOutSharp.PackerType 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, }; if (fileContent.FirstPosition(check, out _)) - return "Compact Version 2.0 (16-bit)"; + return "Compact 2.0 (16-bit)"; check = new byte[] { @@ -158,7 +158,7 @@ namespace BurnOutSharp.PackerType 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, }; if (fileContent.FirstPosition(check, out _)) - return "Software Installation Version 2.0 (16-bit)"; + return "Software Installation 2.0 (16-bit)"; check = new byte[] { @@ -200,7 +200,7 @@ namespace BurnOutSharp.PackerType 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, }; if (fileContent.FirstPosition(check, out _)) - return "Compact Version 2.1 RC2 (16-bit)"; + return "Compact 2.1 RC2 (16-bit)"; check = new byte[] { @@ -214,7 +214,7 @@ namespace BurnOutSharp.PackerType 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, }; if (fileContent.FirstPosition(check, out _)) - return "Software Installation Version 2.1 RC2 (16-bit)"; + return "Software Installation 2.1 RC2 (16-bit)"; check = new byte[] { @@ -256,7 +256,7 @@ namespace BurnOutSharp.PackerType 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, }; if (fileContent.FirstPosition(check, out _)) - return "Compact Version 2.1 (16-bit)"; + return "Compact 2.1 (16-bit)"; check = new byte[] { @@ -271,7 +271,7 @@ namespace BurnOutSharp.PackerType }; if (fileContent.FirstPosition(check, out _)) - return "Software Installation Version 2.1 (16-bit)"; + return "Software Installation 2.1 (16-bit)"; #endregion @@ -305,7 +305,7 @@ namespace BurnOutSharp.PackerType 0x2E, 0x53, 0x46, 0x58, }; if (fileContent.FirstPosition(check, out _)) - return "Software Installation Version 2.0 (32-bit)"; + return "Software Installation 2.0 (32-bit)"; // .............���3....�P..............�P..�P..�P..VW95SE.SFX check = new byte[] @@ -335,7 +335,7 @@ namespace BurnOutSharp.PackerType 0x2E, 0x53, 0x46, 0x58, }; if (fileContent.FirstPosition(check, out _)) - return "Software Installation Version 2.1 RC2 (32-bit)"; + return "Software Installation 2.1 RC2 (32-bit)"; // .............U��3....�P..............�P..�P..�P..VW95SE.SFX check = new byte[] @@ -365,7 +365,7 @@ namespace BurnOutSharp.PackerType 0x2E, 0x53, 0x46, 0x58, }; if (fileContent.FirstPosition(check, out _)) - return "Software Installation Version 2.1 (32-bit)"; + return "Software Installation 2.1 (32-bit)"; #endregion @@ -397,11 +397,11 @@ namespace BurnOutSharp.PackerType 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, }; if (fileContent.FirstPosition(check, out _)) - return "Software Installation Version 2.2.4003"; + return "Software Installation 2.2.4003"; #endregion - return "Unknown Version 2.X"; + return "Unknown 2.X"; } private static string GetV3PlusVersion(string version) @@ -420,7 +420,7 @@ namespace BurnOutSharp.PackerType case "4.0.1221.0": return "4.0.12218"; default: - return $"(Unknown Version - {version})"; + return $"(Unknown - {version})"; } } } diff --git a/BurnOutSharp/ProtectionType/AACS.cs b/BurnOutSharp/ProtectionType/AACS.cs index db1df395..87aa9916 100644 --- a/BurnOutSharp/ProtectionType/AACS.cs +++ b/BurnOutSharp/ProtectionType/AACS.cs @@ -15,7 +15,7 @@ namespace BurnOutSharp.ProtectionType { string file = files.FirstOrDefault(f => Path.GetFileName(f).Equals("MKBROM.AACS", StringComparison.OrdinalIgnoreCase)); int? version = GetVersion(file); - return version == null ? "AACS (Unknown Version)" : $"AACS Version {version}"; + return version == null ? "AACS (Unknown Version)" : $"AACS {version}"; } // BD-ROM @@ -23,7 +23,7 @@ namespace BurnOutSharp.ProtectionType { string file = files.FirstOrDefault(f => Path.GetFileName(f).Equals("MKB_RO.inf", StringComparison.OrdinalIgnoreCase)); int? version = GetVersion(file); - return version == null ? "AACS (Unknown Version)" : $"AACS Version {version}"; + return version == null ? "AACS (Unknown Version)" : $"AACS {version}"; } return null; @@ -38,14 +38,14 @@ namespace BurnOutSharp.ProtectionType if (filename.Equals("MKBROM.AACS", StringComparison.OrdinalIgnoreCase)) { int? version = GetVersion(path); - return version == null ? "AACS (Unknown Version)" : $"AACS Version {version}"; + return version == null ? "AACS (Unknown Version)" : $"AACS {version}"; } // BD-ROM if (filename.Equals("MKB_RO.inf", StringComparison.OrdinalIgnoreCase)) { int? version = GetVersion(path); - return version == null ? "AACS (Unknown Version)" : $"AACS Version {version}"; + return version == null ? "AACS (Unknown Version)" : $"AACS {version}"; } return null; diff --git a/BurnOutSharp/ProtectionType/BDPlus.cs b/BurnOutSharp/ProtectionType/BDPlus.cs index 967890d5..6400fc28 100644 --- a/BurnOutSharp/ProtectionType/BDPlus.cs +++ b/BurnOutSharp/ProtectionType/BDPlus.cs @@ -15,7 +15,7 @@ namespace BurnOutSharp.ProtectionType { string file = files.FirstOrDefault(f => Path.GetFileName(f).Equals("00000.svm", StringComparison.OrdinalIgnoreCase)); string version = GetVersion(file); - return version == null ? "BD+ (Unknown Version)" : $"BD+ Version {version}"; + return version == null ? "BD+ (Unknown Version)" : $"BD+ {version}"; } return null; @@ -28,7 +28,7 @@ namespace BurnOutSharp.ProtectionType if (filename.Equals("00000.svm", StringComparison.OrdinalIgnoreCase)) { string version = GetVersion(path); - return version == null ? "BD+ (Unknown Version)" : $"BD+ Version {version}"; + return version == null ? "BD+ (Unknown Version)" : $"BD+ {version}"; } return null;