From 2c817e3057b9c5326d19ed35922c7300643f8d8a Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 19 May 2020 23:37:59 +1000 Subject: [PATCH] Use Range.Count extensions --- .../Base Implementations/MemoryDomain.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs index b717f10c4e..7d0558f9ad 100644 --- a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs +++ b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs @@ -108,7 +108,7 @@ namespace BizHawk.Emulation.Common throw new ArgumentException(); } - if (addresses.EndInclusive - addresses.Start + 1 != values.Length) + if ((long) addresses.Count() != values.Length) { throw new InvalidOperationException("Invalid length of values array"); } @@ -126,13 +126,13 @@ namespace BizHawk.Emulation.Common throw new ArgumentException(); } - long start = addresses.Start; - long nAddresses = addresses.EndInclusive - addresses.Start + 1; + var nAddresses = (long) addresses.Count(); if (nAddresses != values.Length) { throw new InvalidOperationException("Invalid length of values array"); } + var start = addresses.Start; for (var i = 0; i < nAddresses; i++) { values[i] = PeekUshort(start + i*2, bigEndian); @@ -146,13 +146,13 @@ namespace BizHawk.Emulation.Common throw new ArgumentException(); } - long start = addresses.Start; - long nAddresses = addresses.EndInclusive - addresses.Start + 1; + var nAddresses = (long) addresses.Count(); if (nAddresses != values.Length) { throw new InvalidOperationException("Invalid length of values array"); } + var start = addresses.Start; for (var i = 0; i