parent
5685befe14
commit
651c79abeb
|
@ -222,8 +222,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
|
||||||
// sign that the tape is no longer playing
|
// sign that the tape is no longer playing
|
||||||
_tapeIsPlaying = false;
|
_tapeIsPlaying = false;
|
||||||
|
|
||||||
if (_currentDataBlockIndex >= 0 && // we are at datablock 1 or above //TODO 1-indexed then? --yoshi
|
if (_currentDataBlockIndex >= 0 // we are at datablock 1 or above //TODO 1-indexed then? --yoshi
|
||||||
_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
|
||||||
_currentDataBlockIndex++;
|
_currentDataBlockIndex++;
|
||||||
|
|
|
@ -200,7 +200,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
|
||||||
_waitEdge = 0;
|
_waitEdge = 0;
|
||||||
_position = 0;
|
_position = 0;
|
||||||
|
|
||||||
if (_currentDataBlockIndex < 0 && _dataBlocks.Count > 0)
|
if (_currentDataBlockIndex < 0 && _dataBlocks.Count > 0) //TODO deleted a comment that said "block index is -1", but code is clearly "is negative"--are lower values not reachable? --yoshi
|
||||||
{
|
{
|
||||||
// move the index on to 0
|
// move the index on to 0
|
||||||
_currentDataBlockIndex = 0;
|
_currentDataBlockIndex = 0;
|
||||||
|
@ -814,7 +814,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// don't autostop if there is only 1 block
|
// don't autostop if there is only 1 block
|
||||||
if (DataBlocks.Count == 1
|
if (DataBlocks.Count is 1
|
||||||
|| _dataBlocks[_currentDataBlockIndex].BlockDescription is BlockType.CSW_Recording or BlockType.WAV_Recording)
|
|| _dataBlocks[_currentDataBlockIndex].BlockDescription is BlockType.CSW_Recording or BlockType.WAV_Recording)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -204,7 +204,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
|
||||||
case LibsnesApi.SNES_MAPPER.BSXROM:
|
case LibsnesApi.SNES_MAPPER.BSXROM:
|
||||||
if (bank is (>= 0x40 and <= 0x7F) or >= 0xC0
|
if (bank is (>= 0x40 and <= 0x7F) or >= 0xC0
|
||||||
|| (low >= 0x8000 && bank is (>= 0x00 and <= 0x3F) or (>= 0x80 and <= 0xBF))
|
|| (low >= 0x8000 && bank is (>= 0x00 and <= 0x3F) or (>= 0x80 and <= 0xBF))
|
||||||
|| (low >= 0x6000 and <= 0x7FFF && bank is >= 0x20 and <= 0x3F))
|
|| (low is >= 0x6000 and <= 0x7FFF && bank is >= 0x20 and <= 0x3F))
|
||||||
{
|
{
|
||||||
return Api.QUERY_peek(LibsnesApi.SNES_MEMORY.SYSBUS, (uint)addr);
|
return Api.QUERY_peek(LibsnesApi.SNES_MEMORY.SYSBUS, (uint)addr);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue