ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1429 from YoshiRulz/master 

Inconsequential changes (no whitespace)

looks good to me
This commit is contained in:
alyosha-tas 2019-03-09 17:32:10 -06:00 committed by GitHub
parent e5d94f3d7c c0a28a320b
commit 6d0973ca7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.DiscoHawk/DiscoHawkDialog.cs
View File

@ -95,7 +95,7 @@ namespace BizHawk.Client.DiscoHawk
}
var cueBin = boundDisc.DumpCueBin(boundDiscRecord.BaseName, GetCuePrefs());
txtCuePreview.Text = cueBin.cue.Replace("\n", "\r\n"); ;
txtCuePreview.Text = cueBin.cue.Replace("\n", "\r\n");
}
private void btnPresetCanonical_Click(object sender, EventArgs e)

4
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
View File

@ -350,8 +350,8 @@ namespace BizHawk.Client.EmuHawk
set
{
var item = StartFromSlotBox.Items.
OfType<object>()
var item = StartFromSlotBox.Items
.OfType<object>()
.FirstOrDefault(o => o.ToString() == value);
if (item != null)

2
BizHawk.Emulation.Cores/CPUs/LR35902/Operations.cs
View File

@ -159,7 +159,7 @@ namespace BizHawk.Emulation.Common.Components.LR35902
public void SRL_Func(ushort src)
{
FlagC = Regs[src].Bit(0) ? true : false;
FlagC = Regs[src].Bit(0);
Regs[src] = (ushort)(Regs[src] >> 1);

2
BizHawk.Emulation.Cores/CPUs/Z80A/Operations.cs
View File

@ -267,7 +267,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
public void SRL_Func(ushort src)
{
FlagC = Regs[src].Bit(0) ? true : false;
FlagC = Regs[src].Bit(0);
Regs[src] = (ushort)(Regs[src] >> 1);

4
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs
View File

@ -249,7 +249,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
dCount = GetInt32(b, pos);
initPulseLevel = (uint)((dCount & 0x80000000) == 0 ? 0 : 1);
t.InitialPulseLevel = initPulseLevel == 1 ? true : false;
t.InitialPulseLevel = initPulseLevel == 1;
dCount = (int)(dCount & 0x7FFFFFFF);
pos += 4;
@ -334,7 +334,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
var d = GetInt32(b, pos);
iniPulseLevel = ((d & 0x80000000) == 0 ? 0 : 1);
t.InitialPulseLevel = iniPulseLevel == 1 ? true : false;
t.InitialPulseLevel = iniPulseLevel == 1;
pCount = (d & 0x7FFFFFFF);
// convert to tape block

2
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs
View File

@ -172,7 +172,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
byte cart_1 = header[0x35];
byte cart_2 = header[0x36];
_isPAL = (header[0x39] > 0) ? true : false;
_isPAL = (header[0x39] > 0);
if (cart_2.Bit(1))
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1_Multi.cs
View File

@ -120,7 +120,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
if (addr < 0x2000)
{
RAM_enable = ((value & 0xA) == 0xA) ? true : false;
RAM_enable = ((value & 0xA) == 0xA);
}
else if (addr < 0x4000)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC2.cs
View File

@ -81,7 +81,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
if ((addr & 0x100) == 0)
{
RAM_enable = ((value & 0xA) == 0xA) ? true : false;
RAM_enable = ((value & 0xA) == 0xA);
}
}
else if (addr < 0x4000)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs
View File

@ -142,7 +142,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
if (addr < 0x2000)
{
RAM_enable = ((value & 0xA) == 0xA) ? true : false;
RAM_enable = ((value & 0xA) == 0xA);
}
else if (addr < 0x4000)
{

4
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC7.cs
View File

@ -419,11 +419,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
case 5:
if ((instr_clocks >= 0) && (instr_clocks <= 7))
{
DO = ((Core.cart_RAM[EE_addr * 2 + 1] >> (7 - instr_clocks)) & 1) == 1 ? true : false;
DO = ((Core.cart_RAM[EE_addr * 2 + 1] >> (7 - instr_clocks)) & 1) == 1;
}
else if ((instr_clocks >= 8) && (instr_clocks <= 15))
{
DO = ((Core.cart_RAM[EE_addr * 2] >> (15 - instr_clocks)) & 1) == 1 ? true : false;
DO = ((Core.cart_RAM[EE_addr * 2] >> (15 - instr_clocks)) & 1) == 1;
}
if (instr_clocks == 15)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Cony.cs
View File

@ -451,7 +451,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
else if (addr == 0x200)
{
IRQCount &= 0xFF00; IRQCount |= value; ;
IRQCount &= 0xFF00; IRQCount |= value;
IRQSignal = false;
}

16
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper222.cs
View File

@ -66,14 +66,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//Console.WriteLine("IRQ GO: SL {0} val {1}", NES.ppu.ppur.status.sl, value);
//break;
case 0x1000: SetMirrorType(!value.Bit(0) ? EMirrorType.Vertical : EMirrorType.Horizontal);break;
case 0x3000: chr[0] = value & chr_bank_mask_1k; ; break;
case 0x3002: chr[1] = value & chr_bank_mask_1k; ; break;
case 0x4000: chr[2] = value & chr_bank_mask_1k; ; break;
case 0x4002: chr[3] = value & chr_bank_mask_1k; ; break;
case 0x5000: chr[4] = value & chr_bank_mask_1k; ; break;
case 0x5002: chr[5] = value & chr_bank_mask_1k; ; break;
case 0x6000: chr[6] = value & chr_bank_mask_1k; ; break;
case 0x6002: chr[7] = value & chr_bank_mask_1k; ; break;
case 0x3000: chr[0] = value & chr_bank_mask_1k; break;
case 0x3002: chr[1] = value & chr_bank_mask_1k; break;
case 0x4000: chr[2] = value & chr_bank_mask_1k; break;
case 0x4002: chr[3] = value & chr_bank_mask_1k; break;
case 0x5000: chr[4] = value & chr_bank_mask_1k; break;
case 0x5002: chr[5] = value & chr_bank_mask_1k; break;
case 0x6000: chr[6] = value & chr_bank_mask_1k; break;
case 0x6002: chr[7] = value & chr_bank_mask_1k; break;
}

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs
View File

@ -326,7 +326,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
string str = "oamdata" + i.ToString() + "y";
oam_byte = t_oam[i].oam_y; ser.Sync(str, ref oam_byte); t_oam[i].oam_y = oam_byte;
str = "oamdata" + i.ToString() + "ind";
oam_byte = t_oam[i].oam_ind; ; ser.Sync(str, ref oam_byte); t_oam[i].oam_ind = oam_byte;
oam_byte = t_oam[i].oam_ind; ser.Sync(str, ref oam_byte); t_oam[i].oam_ind = oam_byte;
str = "oamdata" + i.ToString() + "attr";
oam_byte = t_oam[i].oam_attr; ser.Sync(str, ref oam_byte); t_oam[i].oam_attr = oam_byte;
str = "oamdata" + i.ToString() + "x";

2
BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IVideoProvider.cs
View File

@ -78,7 +78,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
for (int i = 0; i < xpad; i++)
*pdst++ = unchecked((int)0xff000000);
for (int i = 0; i < gpwidth; i++)
*pdst++ = *psrc++; ;
*pdst++ = *psrc++;
for (int i = 0; i < xpad2; i++)
*pdst++ = unchecked((int)0xff000000);
psrc += rinc;