diff --git a/src/common/jsonDefinitions.hxx b/src/common/jsonDefinitions.hxx index a7a394f49..ac51e0d4d 100644 --- a/src/common/jsonDefinitions.hxx +++ b/src/common/jsonDefinitions.hxx @@ -207,6 +207,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(Event::Type, { {Event::StartPauseMode, "StartPauseMode"}, {Event::OptionsMenuMode, "OptionsMenuMode"}, {Event::CmdMenuMode, "CmdMenuMode"}, + {Event::HighScoresMenuMode, "HighScoresMenuMode"}, {Event::DebuggerMode, "DebuggerMode"}, {Event::ExitMode, "ExitMode"}, {Event::TakeSnapshot, "TakeSnapshot"}, diff --git a/src/emucore/Props.cxx b/src/emucore/Props.cxx index 70dc4e828..69ff474b3 100644 --- a/src/emucore/Props.cxx +++ b/src/emucore/Props.cxx @@ -60,8 +60,6 @@ void Properties::set(PropType key, const string& value) case PropType::Controller_MouseAxis: case PropType::Display_Format: case PropType::Display_Phosphor: - case PropType::Cart_Formats: - case PropType::Cart_Addresses: { BSPF::toUpperCase(myProperties[pos]); break; @@ -268,9 +266,6 @@ void Properties::print() const << get(PropType::Display_VCenter) << "|" << get(PropType::Display_Phosphor) << "|" << get(PropType::Display_PPBlend) << "|" - << get(PropType::Cart_Variations) << "|" - << get(PropType::Cart_Formats) << "|" - << get(PropType::Cart_Addresses) << "|" << get(PropType::Cart_Highscore) << endl; } @@ -331,9 +326,6 @@ void Properties::printHeader() << "Display_VCenter|" << "Display_Phosphor|" << "Display_PPBlend|" - << "Cart_Variations|" - << "Cart_Formats|" - << "Cart_Addresses|" << "Cart_Highscore" << endl; } @@ -368,9 +360,6 @@ std::array Properties::ourDefaultProperties = "0", // Display.VCenter "NO", // Display.Phosphor "0", // Display.PPBlend - "1", // Cart.Variations - "", // Cart.Formats, - "", // Cart.Addresses "" // Cart.Highscore }; @@ -404,8 +393,5 @@ std::array Properties::ourPropertyNames = "Display.VCenter", "Display.Phosphor", "Display.PPBlend", - "Cart.Variations", - "Cart.Formats", - "Cart.Addresses", "Cart.Highscore" }; diff --git a/src/emucore/Props.hxx b/src/emucore/Props.hxx index 1fbdc9761..8aaf4ecaf 100644 --- a/src/emucore/Props.hxx +++ b/src/emucore/Props.hxx @@ -48,9 +48,6 @@ enum class PropType : uInt8 { Display_VCenter, Display_Phosphor, Display_PPBlend, - Cart_Variations, - Cart_Formats, - Cart_Addresses, Cart_Highscore, NumTypes }; diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx index 83167e1cb..49b0e6d85 100644 --- a/src/gui/GameInfoDialog.cxx +++ b/src/gui/GameInfoDialog.cxx @@ -1022,9 +1022,7 @@ void GameInfoDialog::saveHighScoresProperties() } else { - myGameProperties.reset(PropType::Cart_Variations); - myGameProperties.reset(PropType::Cart_Formats); - myGameProperties.reset(PropType::Cart_Addresses); + myGameProperties.reset(PropType::Cart_Highscore); } }