From ae1692f2e17e9a0457d5da464ae1511c1e07a409 Mon Sep 17 00:00:00 2001 From: James Groom Date: Sun, 12 May 2024 07:24:04 +1000 Subject: [PATCH] Fix passing value instead of name to AooRE and leave a note for myself re: patches --- src/BizHawk.Emulation.Common/Database/FirmwareID.cs | 4 ++-- src/BizHawk.Emulation.Common/Database/FirmwarePatchData.cs | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/BizHawk.Emulation.Common/Database/FirmwareID.cs b/src/BizHawk.Emulation.Common/Database/FirmwareID.cs index 70173dc9c4..a0bdbdd718 100644 --- a/src/BizHawk.Emulation.Common/Database/FirmwareID.cs +++ b/src/BizHawk.Emulation.Common/Database/FirmwareID.cs @@ -22,8 +22,8 @@ namespace BizHawk.Emulation.Common static bool IsAllowedCharacter(char c) => c is '-' or (>= '0' and <= '9') or (>= 'A' and <= 'Z') or '_' or (>= 'a' and <= 'z'); const string ERR_MSG_INVALID_CHAR = "FWIDs must match /[-0-9A-Z_a-z]+/"; - if (!system.All(IsAllowedCharacter)) throw new ArgumentOutOfRangeException(paramName: system, actualValue: system, message: ERR_MSG_INVALID_CHAR); - if (!firmware.All(IsAllowedCharacter)) throw new ArgumentOutOfRangeException(paramName: firmware, actualValue: firmware, message: ERR_MSG_INVALID_CHAR); + if (!system.All(IsAllowedCharacter)) throw new ArgumentOutOfRangeException(paramName: nameof(system), actualValue: system, message: ERR_MSG_INVALID_CHAR); + if (!firmware.All(IsAllowedCharacter)) throw new ArgumentOutOfRangeException(paramName: nameof(firmware), actualValue: firmware, message: ERR_MSG_INVALID_CHAR); System = system; Firmware = firmware; } diff --git a/src/BizHawk.Emulation.Common/Database/FirmwarePatchData.cs b/src/BizHawk.Emulation.Common/Database/FirmwarePatchData.cs index 371ffe8851..233e854127 100644 --- a/src/BizHawk.Emulation.Common/Database/FirmwarePatchData.cs +++ b/src/BizHawk.Emulation.Common/Database/FirmwarePatchData.cs @@ -7,7 +7,10 @@ namespace BizHawk.Emulation.Common /// Represents a binary patch, to be applied to a byte array. Patches must be contiguous; multiple instances can be used to for non-contiguous patches. /// Patches usually contain data which needs to be XOR'd with a base file, but with set to , this struct can represent data which should replace part of a base file. /// - /// TODO no mechanism to change length, would that be useful? --yoshi + /// + /// TODO no mechanism to change length, would that be useful? --yoshi
+ /// upon further reflection, I'm heading towards what is effectively a worse .bps, so maybe just use that --a later yoshi + /// public readonly struct FirmwarePatchData { public readonly byte[] Contents;