From e2dabba30997fecbbe6b3ad0e1151d5d6e8cec13 Mon Sep 17 00:00:00 2001 From: thrust26 Date: Sun, 6 Jan 2019 18:04:19 +0100 Subject: [PATCH] updated serializers added some game names to new TIA settings --- src/common/StateManager.cxx | 2 +- src/emucore/tia/Player.cxx | 2 ++ src/emucore/tia/TIA.cxx | 4 ++++ src/gui/DeveloperDialog.cxx | 10 +++++----- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/common/StateManager.cxx b/src/common/StateManager.cxx index 721b871e5..43b58b2a0 100644 --- a/src/common/StateManager.cxx +++ b/src/common/StateManager.cxx @@ -27,7 +27,7 @@ #include "StateManager.hxx" -#define STATE_HEADER "06000001state" +#define STATE_HEADER "06000002state" // #define MOVIE_HEADER "03030000movie" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/tia/Player.cxx b/src/emucore/tia/Player.cxx index 9f11980cb..8cf5c75f9 100644 --- a/src/emucore/tia/Player.cxx +++ b/src/emucore/tia/Player.cxx @@ -493,6 +493,7 @@ bool Player::save(Serializer& out) const out.putBool(myIsReflected); out.putBool(myIsDelaying); + out.putBool(myStuffedClock); } catch(...) { @@ -539,6 +540,7 @@ bool Player::load(Serializer& in) myIsReflected = in.getBool(); myIsDelaying = in.getBool(); + myStuffedClock = in.getBool(); applyColors(); } diff --git a/src/emucore/tia/TIA.cxx b/src/emucore/tia/TIA.cxx index ed1dcfcac..472e06736 100644 --- a/src/emucore/tia/TIA.cxx +++ b/src/emucore/tia/TIA.cxx @@ -296,6 +296,8 @@ bool TIA::save(Serializer& out) const out.putByte(myPFBitsDelay); out.putByte(myPFColorDelay); + out.putByte(myP0SwapDelay); + out.putByte(myP1SwapDelay); } catch(...) { @@ -368,6 +370,8 @@ bool TIA::load(Serializer& in) myPFBitsDelay = in.getByte(); myPFColorDelay = in.getByte(); + myP0SwapDelay = in.getByte(); + myP1SwapDelay = in.getByte(); } catch(...) { diff --git a/src/gui/DeveloperDialog.cxx b/src/gui/DeveloperDialog.cxx index ccdaa2db0..c354af990 100644 --- a/src/gui/DeveloperDialog.cxx +++ b/src/gui/DeveloperDialog.cxx @@ -202,27 +202,27 @@ void DeveloperDialog::addTiaTab(const GUI::Font& font) ypos += lineHeight + VGAP * 1; myPFBitsWidget = new CheckboxWidget(myTab, font, HBORDER + INDENT, ypos + 1, - "Delayed playfield bits"); + "Delayed playfield bits (Thrust, Pesco)"); wid.push_back(myPFBitsWidget); ypos += lineHeight + VGAP * 1; myPFColorWidget = new CheckboxWidget(myTab, font, HBORDER + INDENT, ypos + 1, - "Delayed playfield color"); + "Delayed playfield color (Quick Step/Ixion)"); wid.push_back(myPFColorWidget); ypos += lineHeight + VGAP * 1; myGRP0SwapWidget = new CheckboxWidget(myTab, font, HBORDER + INDENT, ypos + 1, - "Delayed player 0 swap"); + "Delayed player 0 swap (He-Man V1, Obelix)"); wid.push_back(myGRP0SwapWidget); ypos += lineHeight + VGAP * 1; myGRP1SwapWidget = new CheckboxWidget(myTab, font, HBORDER + INDENT, ypos + 1, - "Delayed player 1 swap"); + "Delayed player 1 swap (He-Man V2)"); wid.push_back(myGRP1SwapWidget); ypos += lineHeight + VGAP * 1; myGRPxStuffedWidget = new CheckboxWidget(myTab, font, HBORDER + INDENT, ypos + 1, - "Stuffed player move"); + "Stuffed player move (Kool Aid Man/Thunderground)"); wid.push_back(myGRPxStuffedWidget); ypos += lineHeight + VGAP * 1;