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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2017-12-16 09:46:50 +01:00
parent 31b459ac84 8e7d0aa7b3
commit 0e5a444699
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emucore/tia/frame-manager/AbstractFrameManager.cxx
View File

@ -125,6 +125,7 @@ bool AbstractFrameManager::save(Serializer& out) const
out.putBool(myIsRendering); out.putBool(myIsRendering);
out.putBool(myVsync); out.putBool(myVsync);
out.putBool(myVblank); out.putBool(myVblank);
out.putInt(myCurrentFrameTotalLines);
out.putInt(myCurrentFrameFinalLines); out.putInt(myCurrentFrameFinalLines);
out.putInt(myPreviousFrameFinalLines); out.putInt(myPreviousFrameFinalLines);
out.putInt(myTotalFrames); out.putInt(myTotalFrames);
@ -149,6 +150,7 @@ bool AbstractFrameManager::load(Serializer& in)
myIsRendering = in.getBool(); myIsRendering = in.getBool();
myVsync = in.getBool(); myVsync = in.getBool();
myVblank = in.getBool(); myVblank = in.getBool();
myCurrentFrameTotalLines = in.getInt();
myCurrentFrameFinalLines = in.getInt(); myCurrentFrameFinalLines = in.getInt();
myPreviousFrameFinalLines = in.getInt(); myPreviousFrameFinalLines = in.getInt();
myTotalFrames = in.getInt(); myTotalFrames = in.getInt();

2
src/emucore/tia/frame-manager/FrameManager.cxx
View File

@ -214,6 +214,7 @@ bool FrameManager::onSave(Serializer& out) const
out.putInt(myFrameLines); out.putInt(myFrameLines);
out.putInt(myHeight); out.putInt(myHeight);
out.putInt(myFixedHeight); out.putInt(myFixedHeight);
out.putInt(myYStart);
out.putBool(myJitterEnabled); out.putBool(myJitterEnabled);
@ -240,6 +241,7 @@ bool FrameManager::onLoad(Serializer& in)
myFrameLines = in.getInt(); myFrameLines = in.getInt();
myHeight = in.getInt(); myHeight = in.getInt();
myFixedHeight = in.getInt(); myFixedHeight = in.getInt();
myYStart = in.getInt();
myJitterEnabled = in.getBool(); myJitterEnabled = in.getBool();