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

Replace some spaces used as indentation

This commit is contained in:
James Groom 2024-03-26 16:52:47 +00:00 committed by GitHub
parent 7b5f688590
commit 3c2b01f34b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs
View File

@ -177,8 +177,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
_position = 0; _position = 0;
if ( if (
_dataBlocks.Count > 0 && // data blocks are present && _dataBlocks.Count > 0 && // data blocks are present &&
_currentDataBlockIndex >= 0 // the current data block index is 1 or greater _currentDataBlockIndex >= 0 // the current data block index is 1 or greater
) )
{ {
while (_position >= _dataBlocks[_currentDataBlockIndex].DataPeriods.Count) while (_position >= _dataBlocks[_currentDataBlockIndex].DataPeriods.Count)
@ -226,8 +226,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
_tapeIsPlaying = false; _tapeIsPlaying = false;
if ( if (
_currentDataBlockIndex >= 0 && // we are at datablock 1 or above _currentDataBlockIndex >= 0 && // we are at datablock 1 or above
_position >= _dataBlocks[_currentDataBlockIndex].DataPeriods.Count - 1 // the block is still playing back _position >= _dataBlocks[_currentDataBlockIndex].DataPeriods.Count - 1 // the block is still playing back
) )
{ {
// move to the next block // move to the next block
@ -243,8 +243,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
_position = 0; _position = 0;
if ( if (
_currentDataBlockIndex < 0 && // block index is -1 _currentDataBlockIndex < 0 && // block index is -1
_dataBlocks.Count > 0 // number of blocks is greater than 0 _dataBlocks.Count > 0 // number of blocks is greater than 0
) )
{ {
// move the index on to 0 // move the index on to 0

12
src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
View File

@ -140,8 +140,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
_position = 0; _position = 0;
if ( if (
_dataBlocks.Count > 0 && // data blocks are present && _dataBlocks.Count > 0 && // data blocks are present &&
_currentDataBlockIndex >= 0 // the current data block index is 1 or greater _currentDataBlockIndex >= 0 // the current data block index is 1 or greater
) )
{ {
while (_position >= _dataBlocks[_currentDataBlockIndex].DataPeriods.Count) while (_position >= _dataBlocks[_currentDataBlockIndex].DataPeriods.Count)
@ -189,8 +189,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
_tapeIsPlaying = false; _tapeIsPlaying = false;
if ( if (
_currentDataBlockIndex >= 0 && // we are at datablock 1 or above _currentDataBlockIndex >= 0 && // we are at datablock 1 or above
_position >= _dataBlocks[_currentDataBlockIndex].DataPeriods.Count - 1 // the block is still playing back _position >= _dataBlocks[_currentDataBlockIndex].DataPeriods.Count - 1 // the block is still playing back
) )
{ {
// move to the next block // move to the next block
@ -206,8 +206,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
_position = 0; _position = 0;
if ( if (
_currentDataBlockIndex < 0 && // block index is -1 _currentDataBlockIndex < 0 && // block index is -1
_dataBlocks.Count > 0 // number of blocks is greater than 0 _dataBlocks.Count > 0 // number of blocks is greater than 0
) )
{ {
// move the index on to 0 // move the index on to 0

66
src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs
View File

@ -33,22 +33,22 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private static readonly int[] ULAPalette = private static readonly int[] ULAPalette =
{ {
Colors.ARGB(0x00, 0x00, 0x00), // Black Colors.ARGB(0x00, 0x00, 0x00), // Black
Colors.ARGB(0x00, 0x00, 0xD7), // Blue Colors.ARGB(0x00, 0x00, 0xD7), // Blue
Colors.ARGB(0xD7, 0x00, 0x00), // Red Colors.ARGB(0xD7, 0x00, 0x00), // Red
Colors.ARGB(0xD7, 0x00, 0xD7), // Magenta Colors.ARGB(0xD7, 0x00, 0xD7), // Magenta
Colors.ARGB(0x00, 0xD7, 0x00), // Green Colors.ARGB(0x00, 0xD7, 0x00), // Green
Colors.ARGB(0x00, 0xD7, 0xD7), // Cyan Colors.ARGB(0x00, 0xD7, 0xD7), // Cyan
Colors.ARGB(0xD7, 0xD7, 0x00), // Yellow Colors.ARGB(0xD7, 0xD7, 0x00), // Yellow
Colors.ARGB(0xD7, 0xD7, 0xD7), // White Colors.ARGB(0xD7, 0xD7, 0xD7), // White
Colors.ARGB(0x00, 0x00, 0x00), // Bright Black Colors.ARGB(0x00, 0x00, 0x00), // Bright Black
Colors.ARGB(0x00, 0x00, 0xFF), // Bright Blue Colors.ARGB(0x00, 0x00, 0xFF), // Bright Blue
Colors.ARGB(0xFF, 0x00, 0x00), // Bright Red Colors.ARGB(0xFF, 0x00, 0x00), // Bright Red
Colors.ARGB(0xFF, 0x00, 0xFF), // Bright Magenta Colors.ARGB(0xFF, 0x00, 0xFF), // Bright Magenta
Colors.ARGB(0x00, 0xFF, 0x00), // Bright Green Colors.ARGB(0x00, 0xFF, 0x00), // Bright Green
Colors.ARGB(0x00, 0xFF, 0xFF), // Bright Cyan Colors.ARGB(0x00, 0xFF, 0xFF), // Bright Cyan
Colors.ARGB(0xFF, 0xFF, 0x00), // Bright Yellow Colors.ARGB(0xFF, 0xFF, 0x00), // Bright Yellow
Colors.ARGB(0xFF, 0xFF, 0xFF), // Bright White Colors.ARGB(0xFF, 0xFF, 0xFF), // Bright White
}; };
/// <summary> /// <summary>
/// The CPU speed /// The CPU speed
@ -320,35 +320,35 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
switch (scrPix & 7) switch (scrPix & 7)
{ {
case 0: case 0:
Renderer[item].RAction = RenderAction.Shift1AndFetchByte2; // shift 1 + fetch B2 Renderer[item].RAction = RenderAction.Shift1AndFetchByte2; // shift 1 + fetch B2
// +4 = prefetch! // +4 = prefetch!
Renderer[item].ByteAddress = CalculateByteAddress(scrPix + 4, scrLin); Renderer[item].ByteAddress = CalculateByteAddress(scrPix + 4, scrLin);
break; break;
case 1: case 1:
Renderer[item].RAction = RenderAction.Shift1AndFetchAttribute2; // shift 1 + fetch A2 Renderer[item].RAction = RenderAction.Shift1AndFetchAttribute2; // shift 1 + fetch A2
// +3 = prefetch! // +3 = prefetch!
Renderer[item].AttributeAddress = CalculateAttributeAddress(scrPix + 3, scrLin); Renderer[item].AttributeAddress = CalculateAttributeAddress(scrPix + 3, scrLin);
break; break;
case 2: case 2:
Renderer[item].RAction = RenderAction.Shift1; // shift 1 Renderer[item].RAction = RenderAction.Shift1; // shift 1
break; break;
case 3: case 3:
Renderer[item].RAction = RenderAction.Shift1Last; // shift 1 (last) Renderer[item].RAction = RenderAction.Shift1Last; // shift 1 (last)
break; break;
case 4: case 4:
Renderer[item].RAction = RenderAction.Shift2; // shift 2 Renderer[item].RAction = RenderAction.Shift2; // shift 2
break; break;
case 5: case 5:
Renderer[item].RAction = RenderAction.Shift2; // shift 2 Renderer[item].RAction = RenderAction.Shift2; // shift 2
break; break;
case 6: case 6:
if (pix < (_ula.FirstPaperTState + 128 - 2)) if (pix < (_ula.FirstPaperTState + 128 - 2))
{ {
Renderer[item].RAction = RenderAction.Shift2AndFetchByte1; // shift 2 + fetch B2 Renderer[item].RAction = RenderAction.Shift2AndFetchByte1; // shift 2 + fetch B2
} }
else else
{ {
Renderer[item].RAction = RenderAction.Shift2; // shift 2 Renderer[item].RAction = RenderAction.Shift2; // shift 2
} }
// +2 = prefetch! // +2 = prefetch!
@ -358,11 +358,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
if (pix < (_ula.FirstPaperTState + 128 - 2)) if (pix < (_ula.FirstPaperTState + 128 - 2))
{ {
//??? //???
Renderer[item].RAction = RenderAction.Shift2AndFetchAttribute1; // shift 2 + fetch A2 Renderer[item].RAction = RenderAction.Shift2AndFetchAttribute1; // shift 2 + fetch A2
} }
else else
{ {
Renderer[item].RAction = RenderAction.Shift2; // shift 2 Renderer[item].RAction = RenderAction.Shift2; // shift 2
} }
// +1 = prefetch! // +1 = prefetch!
@ -371,17 +371,17 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
} }
} }
else if ((line >= _ula.FirstPaperLine) && (line < (_ula.FirstPaperLine + 192)) && else if ((line >= _ula.FirstPaperLine) && (line < (_ula.FirstPaperLine + 192)) &&
(pix == (_ula.FirstPaperTState - 2))) // border & fetch B1 (pix == (_ula.FirstPaperTState - 2))) // border & fetch B1
{ {
Renderer[item].RAction = RenderAction.BorderAndFetchByte1; // border & fetch B1 Renderer[item].RAction = RenderAction.BorderAndFetchByte1; // border & fetch B1
// +2 = prefetch! // +2 = prefetch!
Renderer[item].ByteAddress = CalculateByteAddress(scrPix + 2, scrLin); Renderer[item].ByteAddress = CalculateByteAddress(scrPix + 2, scrLin);
} }
else if ((line >= _ula.FirstPaperLine) && (line < (_ula.FirstPaperLine + 192)) && else if ((line >= _ula.FirstPaperLine) && (line < (_ula.FirstPaperLine + 192)) &&
(pix == (_ula.FirstPaperTState - 1))) // border & fetch A1 (pix == (_ula.FirstPaperTState - 1))) // border & fetch A1
{ {
Renderer[item].RAction = RenderAction.BorderAndFetchAttribute1; // border & fetch A1 Renderer[item].RAction = RenderAction.BorderAndFetchAttribute1; // border & fetch A1
// +1 = prefetch! // +1 = prefetch!
Renderer[item].AttributeAddress = CalculateAttributeAddress(scrPix + 1, scrLin); Renderer[item].AttributeAddress = CalculateAttributeAddress(scrPix + 1, scrLin);
} }
else else
@ -807,7 +807,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
public int VsyncNumerator public int VsyncNumerator
{ {
get => ClockSpeed * 50; // ClockSpeed; } get => ClockSpeed * 50; // ClockSpeed;
set { } set { }
} }