diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs index 97b7e27af4..614a0578a3 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs @@ -1614,9 +1614,9 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC _position++; - int blockLen = data[_position] | - data[_position + 1] << 8 | - data[_position + 2] << 16; + var blockLen = data[_position] + | (data[_position + 1] << 8) + | (data[_position + 2] << 16); _position += 3; // add to tape diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs index 192cf165d2..1957bf3617 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs @@ -1960,9 +1960,9 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum _position++; - int blockLen = data[_position] | - data[_position + 1] << 8 | - data[_position + 2] << 16; + var blockLen = data[_position] + | (data[_position + 1] << 8) + | (data[_position + 2] << 16); _position += 3; // add to tape diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/MemoryMap.cs b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/MemoryMap.cs index 031cdf0d16..8ff3870f66 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/MemoryMap.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/MemoryMap.cs @@ -113,14 +113,14 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk if (port == 1) { // various control pins - return (byte)((ppu.lum_en ? 0x80 : 0) | - (copy_en ? 0x40 : 0) | - (!vpp_en ? 0x20 : 0) | - (!RAM_en ? 0x10 : 0) | - (!ppu_en ? 0x08 : 0) | - (!kybrd_en ? 0x04 : 0) | - (cart_b1 ? 0x02 : 0) | - (cart_b0 ? 0x01 : 0)); + return unchecked((byte) ((ppu.lum_en ? 0x80 : 0) + | (copy_en ? 0x40 : 0) + | (!vpp_en ? 0x20 : 0) + | (!RAM_en ? 0x10 : 0) + | (!ppu_en ? 0x08 : 0) + | (!kybrd_en ? 0x04 : 0) + | (cart_b1 ? 0x02 : 0) + | (cart_b0 ? 0x01 : 0))); } // keyboard diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs index a259b83e08..21660be789 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs @@ -18,16 +18,11 @@ } private byte Unscramble(byte data) - { - return (byte) - ( - (data >> 1 & 0x01) | - (data >> 4 & 0x02) | - (data << 2 & 0x04) | - (data >> 0 & 0xD8) | - (data << 3 & 0x20) - ); - } + => unchecked((byte) (((data >> 1) & 0x01) + | ((data >> 4) & 0x02) + | ((data << 2) & 0x04) + | (data & 0xD8) + | ((data << 3) & 0x20))); public override void WritePrg(int addr, byte value) {