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

Banish empty conditional blocks

This commit is contained in:
YoshiRulz 2022-12-04 01:58:53 +10:00
parent 84d2866f53
commit c2d5a9c931
10 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/BizHawk.Bizware.OpenTK3/IGL_TK.cs
View File

@ -618,15 +618,10 @@ namespace BizHawk.Bizware.OpenTK3
ret.Row1.Y = -1.0f;
ret.Row3.X = -(float)dims.Width * 0.5f;
ret.Row3.Y = (float)dims.Height * 0.5f;
if (autoflip)
if (autoflip && _currRenderTarget is not null) // flip as long as we're not a final render target
{
if (_currRenderTarget == null) { }
else
{
//flip as long as we're not a final render target
ret.Row1.Y = 1.0f;
ret.Row3.Y *= -1;
}
ret.Row1.Y = 1.0f;
ret.Row3.Y *= -1;
}
return ret;
}

4
src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
View File

@ -333,9 +333,7 @@ namespace BizHawk.Client.EmuHawk
if (a_bits == 16) bytes = 2;
else if (a_bits == 8) bytes = 1;
else throw new InvalidOperationException($"only 8/16 bits audio are supported by {nameof(AviWriter)} and you chose: {a_bits}");
if (a_channels == 1) { }
else if (a_channels == 2) { }
else throw new InvalidOperationException($"only 1/2 channels audio are supported by {nameof(AviWriter)} and you chose: {a_channels}");
if (a_channels is not (1 or 2)) throw new InvalidOperationException($"only 1/2 channels audio are supported by {nameof(AviWriter)} and you chose: {a_channels}");
wfex.Init();
wfex.nBlockAlign = (ushort)(bytes * a_channels);
wfex.nChannels = (ushort)a_channels;

4
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -605,9 +605,7 @@ namespace BizHawk.Client.EmuHawk
MovieSession.SetMovieController(Emulator.ControllerDefinition); // hack, see interface comment
tasMovie.ClearChanges(); // Don't ask to save changes here.
tasMovie.Save();
if (HandleMovieLoadStuff(tasMovie))
{
}
_ = HandleMovieLoadStuff(tasMovie);
// let's not keep this longer than we actually need
// the user will be prompted to enter a proper name
// when they want to save

8
src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs
View File

@ -637,8 +637,10 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
int buffPos = 0;
int sectorSize = 0;
#pragma warning disable CS0219
int maxTransferCap = 0;
if (maxTransferCap > 0) { }
// if (maxTransferCap > 0) { }
#pragma warning restore CS0219
// calculate requested size of data required
if (ActiveCommandParams.SectorSize == 0)
@ -950,8 +952,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
int buffPos = 0;
int sectorSize = 0;
int maxTransferCap = 0;
if (maxTransferCap > 0) { }
int maxTransferCap = 0; // why doesn't this get flagged for CS0219?
// if (maxTransferCap > 0) { }
// calculate requested size of data required
if (ActiveCommandParams.SectorSize == 0)

14
src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs
View File

@ -337,8 +337,10 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
}
int buffPos = 0;
int sectorSize = 0;
int sectorSize = 0; // why doesn't this get flagged for CS0219?
#pragma warning disable CS0219
int maxTransferCap = 0;
#pragma warning restore CS0219
// calculate requested size of data required
if (ActiveCommandParams.SectorSize == 0)
@ -353,7 +355,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
if (!CMD_FLAG_MF)
maxTransferCap = 3328;
if (maxTransferCap == 0) { }
// if (maxTransferCap is 0) { }
}
else
{
@ -646,8 +648,10 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
int buffPos = 0;
int sectorSize = 0;
#pragma warning disable CS0219
int maxTransferCap = 0;
if (maxTransferCap > 0) { }
// if (maxTransferCap > 0) { }
#pragma warning restore CS0219
// calculate requested size of data required
if (ActiveCommandParams.SectorSize == 0)
@ -959,8 +963,10 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
int buffPos = 0;
int sectorSize = 0;
#pragma warning disable CS0219
int maxTransferCap = 0;
if (maxTransferCap > 0) { }
// if (maxTransferCap > 0) { }
#pragma warning restore CS0219
// calculate requested size of data required
if (ActiveCommandParams.SectorSize == 0)

3
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs
View File

@ -58,8 +58,7 @@
}
public override void WritePpu(int addr, byte value)
{
if (addr < 0x2000) { }
else base.WritePpu(addr, value);
if (addr >= 0x2000) base.WritePpu(addr, value);
}
}
}

3
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs
View File

@ -134,8 +134,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
public override void WritePpu(int addr, byte value)
{
if (addr < 0x2000) { }
else base.WritePpu(addr, value);
if (addr >= 0x2000) base.WritePpu(addr, value);
}
public override byte ReadPrg(int addr)

3
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs
View File

@ -47,8 +47,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
public override void WritePpu(int addr, byte value)
{
if (addr < 0x2000) { }
else base.WritePpu(addr, value);
if (addr >= 0x2000) base.WritePpu(addr, value);
}
public override void WritePrg(int addr, byte value)

7
src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs
View File

@ -288,12 +288,7 @@ namespace BizHawk.Emulation.DiscSystem.CUE
private void CreateTrack1Pregap()
{
if (OUT_CompiledCueTracks[1].PregapLength.Sector == 0) { }
else if (OUT_CompiledCueTracks[1].PregapLength.Sector == 150) { }
else
{
Error("Track 1 specified an illegal pregap. It's being ignored and replaced with a 00:02:00 pregap");
}
if (OUT_CompiledCueTracks[1].PregapLength.Sector is not (0 or 150)) Error("Track 1 specified an illegal pregap. It's being ignored and replaced with a 00:02:00 pregap");
OUT_CompiledCueTracks[1].PregapLength = new Timestamp(150);
}

2
src/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_DiscTOC_From_RawTOCEntries_Job.cs
View File

@ -79,7 +79,7 @@ namespace BizHawk.Emulation.DiscSystem
//this is speculative:
//well, nothing to be done here..
if (ret.FirstRecordedTrackNumber == -1) { }
// if (ret.FirstRecordedTrackNumber == -1) { }
if (ret.LastRecordedTrackNumber == -1) { ret.LastRecordedTrackNumber = maxFoundTrack; }
if (ret.Session1Format == SessionFormat.None) ret.Session1Format = SessionFormat.Type00_CDROM_CDDA;