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

Refactor Disk.cs to not use SyncObject, still uses SyncDelta however

This commit is contained in:
adelikat 2017-05-13 11:42:39 -05:00
parent 99d2db0cdc
commit ec07983f92
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Emulation.Cores/Computers/Commodore64/Media/Disk.cs
View File

@ -1,6 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Cores.Computers.Commodore64.Media namespace BizHawk.Emulation.Cores.Computers.Commodore64.Media
@ -162,6 +162,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Media
public void SyncState(Serializer ser) public void SyncState(Serializer ser)
{ {
ser.Sync("WriteProtected", ref WriteProtected);
if (ser.IsReader) if (ser.IsReader)
{ {
var mediaState = new int[_originalMedia.Length]; var mediaState = new int[_originalMedia.Length];
@ -173,7 +175,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Media
var mediaState = SerializeTracks(_tracks); var mediaState = SerializeTracks(_tracks);
SaveState.SyncDelta("MediaState", ser, _originalMedia, ref mediaState); SaveState.SyncDelta("MediaState", ser, _originalMedia, ref mediaState);
} }
SaveState.SyncObject(ser, this);
} }
} }
} }

2
BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs
View File

@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
public override void SyncState(Serializer ser) public override void SyncState(Serializer ser)
{ {
ser.BeginSection("Disk"); ser.BeginSection("Disk");
_disk.SyncState(ser); // TODO _disk.SyncState(ser);
ser.EndSection(); ser.EndSection();
ser.Sync("BitHistory", ref _bitHistory); ser.Sync("BitHistory", ref _bitHistory);