empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Core: Remove old savestate compatibility code

Browse source 
No longer needed since the previous commit broke compatibility completely.
This commit is contained in:
Sour 2019-01-09 20:23:22 -05:00
parent ce68ce57c0
commit 72d9e7ee13
5 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Core/ControlManager.cpp
View file

@ -374,12 +374,8 @@ void ControlManager::StreamState(bool saving)
} }
} }
int32_t unusedMousePositionX = 0;
int32_t unusedMousePositionY = 0;
bool unusedRefreshState = false;
ArrayInfo<ControllerType> types = { controllerTypes, 4 }; ArrayInfo<ControllerType> types = { controllerTypes, 4 };
Stream(unusedRefreshState, unusedMousePositionX, unusedMousePositionY, nesModel, expansionDevice, consoleType, types, hasFourScore, useNes101Hvc101Behavior, zapperDetectionRadius, _lagCounter, _pollCounter); Stream(nesModel, expansionDevice, consoleType, types, hasFourScore, useNes101Hvc101Behavior, zapperDetectionRadius, _lagCounter, _pollCounter);
if(!saving) { if(!saving) {
settings->SetNesModel(nesModel); settings->SetNesModel(nesModel);
@ -396,10 +392,8 @@ void ControlManager::StreamState(bool saving)
UpdateControlDevices(); UpdateControlDevices();
} }
if(GetStateVersion() >= 7) { for(uint8_t i = 0; i < _controlDevices.size(); i++) {
for(uint8_t i = 0; i < _controlDevices.size(); i++) { SnapshotInfo device{ _controlDevices[i].get() };
SnapshotInfo device{ _controlDevices[i].get() }; Stream(device);
Stream(device);
}
} }
} }

3
Core/DeltaModulationChannel.cpp
View file

@ -108,8 +108,7 @@ void DeltaModulationChannel::Clock()
void DeltaModulationChannel::StreamState(bool saving) void DeltaModulationChannel::StreamState(bool saving)
{ {
BaseApuChannel::StreamState(saving); BaseApuChannel::StreamState(saving);
int32_t unused_enableOverclockCounter = 0; Stream(_sampleAddr, _sampleLength, _outputLevel, _irqEnabled, _loopFlag, _currentAddr, _bytesRemaining, _readBuffer, _bufferEmpty, _shiftRegister, _bitsRemaining, _silenceFlag, _needToRun);
Stream(_sampleAddr, _sampleLength, _outputLevel, _irqEnabled, _loopFlag, _currentAddr, _bytesRemaining, _readBuffer, _bufferEmpty, _shiftRegister, _bitsRemaining, _silenceFlag, _needToRun, unused_enableOverclockCounter);
} }
bool DeltaModulationChannel::IrqPending(uint32_t cyclesToRun) bool DeltaModulationChannel::IrqPending(uint32_t cyclesToRun)

8
Core/FDS.cpp
View file

@ -474,17 +474,11 @@ void FDS::StreamState(bool saving)
{ {
BaseMapper::StreamState(saving); BaseMapper::StreamState(saving);
bool unusedNeedIrq = false;
uint32_t unusedNewDiskNumber = 0;
uint32_t unusedNewDiskInsertDelay = 0;
bool unusedIsDirty = false;
SnapshotInfo audio{ _audio.get() }; SnapshotInfo audio{ _audio.get() };
Stream(_irqReloadValue, _irqCounter, _irqEnabled, _irqRepeatEnabled, _diskRegEnabled, _soundRegEnabled, _writeDataReg, _motorOn, _resetTransfer, Stream(_irqReloadValue, _irqCounter, _irqEnabled, _irqRepeatEnabled, _diskRegEnabled, _soundRegEnabled, _writeDataReg, _motorOn, _resetTransfer,
_readMode, _crcControl, _diskReady, _diskIrqEnabled, _extConWriteReg, _badCrc, _endOfHead, _readWriteEnabled, _readDataReg, _diskWriteProtected, _readMode, _crcControl, _diskReady, _diskIrqEnabled, _extConWriteReg, _badCrc, _endOfHead, _readWriteEnabled, _readDataReg, _diskWriteProtected,
_diskNumber, unusedNewDiskNumber, unusedNewDiskInsertDelay, _diskPosition, _delay, _previousCrcControlFlag, _gapEnded, _scanningDisk, unusedNeedIrq, _diskNumber, _diskPosition, _delay, _previousCrcControlFlag, _gapEnded, _scanningDisk, _transferComplete, audio);
_transferComplete, unusedIsDirty, audio);
if(saving) { if(saving) {
vector<uint8_t> ipsData = CreateIpsPatch(); vector<uint8_t> ipsData = CreateIpsPatch();

8
Core/PPU.cpp
View file

@ -1330,18 +1330,14 @@ void PPU::StreamState(bool saving)
disableOamAddrBug = _settings->CheckFlag(EmulationFlags::DisableOamAddrBug); disableOamAddrBug = _settings->CheckFlag(EmulationFlags::DisableOamAddrBug);
} }
uint16_t unusedSpriteDmaAddr = 0;
uint16_t unusedSpriteDmaCounter = 0;
bool unusedSkipScrollIncrement = false;
Stream(_state.Control, _state.Mask, _state.Status, _state.SpriteRamAddr, _state.VideoRamAddr, _state.XScroll, _state.TmpVideoRamAddr, _state.WriteToggle, Stream(_state.Control, _state.Mask, _state.Status, _state.SpriteRamAddr, _state.VideoRamAddr, _state.XScroll, _state.TmpVideoRamAddr, _state.WriteToggle,
_state.HighBitShift, _state.LowBitShift, _flags.VerticalWrite, _flags.SpritePatternAddr, _flags.BackgroundPatternAddr, _flags.LargeSprites, _flags.VBlank, _state.HighBitShift, _state.LowBitShift, _flags.VerticalWrite, _flags.SpritePatternAddr, _flags.BackgroundPatternAddr, _flags.LargeSprites, _flags.VBlank,
_flags.Grayscale, _flags.BackgroundMask, _flags.SpriteMask, _flags.BackgroundEnabled, _flags.SpritesEnabled, _flags.IntensifyRed, _flags.IntensifyGreen, _flags.Grayscale, _flags.BackgroundMask, _flags.SpriteMask, _flags.BackgroundEnabled, _flags.SpritesEnabled, _flags.IntensifyRed, _flags.IntensifyGreen,
_flags.IntensifyBlue, _paletteRamMask, _intensifyColorBits, _statusFlags.SpriteOverflow, _statusFlags.Sprite0Hit, _statusFlags.VerticalBlank, _scanline, _flags.IntensifyBlue, _paletteRamMask, _intensifyColorBits, _statusFlags.SpriteOverflow, _statusFlags.Sprite0Hit, _statusFlags.VerticalBlank, _scanline,
_cycle, _frameCount, _memoryReadBuffer, _currentTile.LowByte, _currentTile.HighByte, _currentTile.PaletteOffset, _nextTile.LowByte, _nextTile.HighByte, _cycle, _frameCount, _memoryReadBuffer, _currentTile.LowByte, _currentTile.HighByte, _currentTile.PaletteOffset, _nextTile.LowByte, _nextTile.HighByte,
_nextTile.PaletteOffset, _nextTile.TileAddr, _previousTile.LowByte, _previousTile.HighByte, _previousTile.PaletteOffset, _spriteIndex, _spriteCount, _nextTile.PaletteOffset, _nextTile.TileAddr, _previousTile.LowByte, _previousTile.HighByte, _previousTile.PaletteOffset, _spriteIndex, _spriteCount,
_secondaryOAMAddr, _sprite0Visible, _oamCopybuffer, _spriteInRange, _sprite0Added, _spriteAddrH, _spriteAddrL, _oamCopyDone, _nesModel, unusedSpriteDmaAddr, _secondaryOAMAddr, _sprite0Visible, _oamCopybuffer, _spriteInRange, _sprite0Added, _spriteAddrH, _spriteAddrL, _oamCopyDone, _nesModel,
unusedSpriteDmaCounter, _prevRenderingEnabled, _renderingEnabled, _openBus, _ignoreVramRead, unusedSkipScrollIncrement, paletteRam, spriteRam, secondarySpriteRam, _prevRenderingEnabled, _renderingEnabled, _openBus, _ignoreVramRead, paletteRam, spriteRam, secondarySpriteRam,
openBusDecayStamp, _cyclesNeeded, disablePpu2004Reads, disablePaletteRead, disableOamAddrBug, _overflowBugCounter, _updateVramAddr, _updateVramAddrDelay, openBusDecayStamp, _cyclesNeeded, disablePpu2004Reads, disablePaletteRead, disableOamAddrBug, _overflowBugCounter, _updateVramAddr, _updateVramAddrDelay,
_needStateUpdate, _ppuBusAddress); _needStateUpdate, _ppuBusAddress);

4
Core/VsControlManager.cpp
View file

@ -32,10 +32,8 @@ void VsControlManager::StreamState(bool saving)
{ {
ControlManager::StreamState(saving); ControlManager::StreamState(saving);
VsInputType unusedInputType = VsInputType::Default;
uint32_t dipSwitches = _console->GetSettings()->GetDipSwitches(); uint32_t dipSwitches = _console->GetSettings()->GetDipSwitches();
Stream(_prgChrSelectBit, _protectionCounter, _refreshState, unusedInputType, dipSwitches); Stream(_prgChrSelectBit, _protectionCounter, _refreshState, dipSwitches);
if(!saving) { if(!saving) {
_console->GetSettings()->SetDipSwitches(dipSwitches); _console->GetSettings()->SetDipSwitches(dipSwitches);