Putting state block loading into the common emulator class

SergioMartin86 · May 23, 2024 · 0defd7c · 0defd7c
1 parent ba188c2
commit 0defd7c
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 24 deletions.
diff --git a/emulators/quickerGPGX/quickerGPGX.hpp b/emulators/quickerGPGX/quickerGPGX.hpp
@@ -24,10 +24,6 @@ class QuickerGPGX final : public Emulator
   QuickerGPGX(const nlohmann::json &config)
     : Emulator(config)
   {
-    // Getting disabled state properties
-    const auto disabledStateProperties = jaffarCommon::json::getArray<std::string>(config, "Disabled State Properties");
-    for (const auto &property : disabledStateProperties) _disabledStateProperties.push_back(property);
-
     // Getting initial state file from the configuration
     _initialStateFilePath = jaffarCommon::json::getString(config, "Initial State File Path");
 

diff --git a/emulators/quickerNES/quickerNES.hpp b/emulators/quickerNES/quickerNES.hpp
@@ -29,10 +29,6 @@ class QuickerNES final : public Emulator
   QuickerNES(const nlohmann::json &config)
     : Emulator(config)
   {
-    // Getting disabled state properties
-    const auto disabledStateProperties = jaffarCommon::json::getArray<std::string>(config, "Disabled State Properties");
-    for (const auto &property : disabledStateProperties) _disabledStateProperties.push_back(property);
-
     // Getting initial state file from the configuration
     _initialStateFilePath = jaffarCommon::json::getString(config, "Initial State File Path");
 

diff --git a/emulators/quickerRAW/quickerRAW.hpp b/emulators/quickerRAW/quickerRAW.hpp
@@ -25,10 +25,6 @@ class QuickerRAW final : public Emulator
   QuickerRAW(const nlohmann::json &config)
     : Emulator(config)
   {
-    // Getting disabled state properties
-    const auto disabledStateProperties = jaffarCommon::json::getArray<std::string>(config, "Disabled State Properties");
-    for (const auto &property : disabledStateProperties) _disabledStateProperties.push_back(property);
-
     // Getting initial state file from the configuration
     _initialStateFilePath = jaffarCommon::json::getString(config, "Initial State File Path");
 

diff --git a/emulators/quickerSMBC/quickerSMBC.hpp b/emulators/quickerSMBC/quickerSMBC.hpp
@@ -25,10 +25,6 @@ class QuickerSMBC final : public Emulator
   QuickerSMBC(const nlohmann::json &config)
     : Emulator(config)
   {
-    // Getting disabled state properties
-    const auto disabledStateProperties = jaffarCommon::json::getArray<std::string>(config, "Disabled State Properties");
-    for (const auto &property : disabledStateProperties) _disabledStateProperties.push_back(property);
-
     // Getting initial state file from the configuration
     _initialStateFilePath = jaffarCommon::json::getString(config, "Initial State File Path");
 

diff --git a/emulators/quickerSnes9x/quickerSnes9x.hpp b/emulators/quickerSnes9x/quickerSnes9x.hpp
@@ -24,10 +24,6 @@ class QuickerSnes9x final : public Emulator
   QuickerSnes9x(const nlohmann::json &config)
     : Emulator(config)
   {
-    // Getting disabled state properties
-    const auto disabledStateProperties = jaffarCommon::json::getArray<std::string>(config, "Disabled State Properties");
-    for (const auto &property : disabledStateProperties) _disabledStateProperties.push_back(property);
-
     // Getting initial state file from the configuration
     _initialStateFilePath = jaffarCommon::json::getString(config, "Initial State File Path");
 

diff --git a/emulators/quickerStella/quickerStella.hpp b/emulators/quickerStella/quickerStella.hpp
@@ -25,10 +25,6 @@ class QuickerStella final : public Emulator
   QuickerStella(const nlohmann::json &config)
     : Emulator(config)
   {
-    // Getting disabled state properties
-    const auto disabledStateProperties = jaffarCommon::json::getArray<std::string>(config, "Disabled State Properties");
-    for (const auto &property : disabledStateProperties) _disabledStateProperties.push_back(property);
-
     // Parsing controller configuration
     _controller1Type = jaffarCommon::json::getString(config, "Controller 1 Type");
     _controller2Type = jaffarCommon::json::getString(config, "Controller 2 Type");

diff --git a/source/emulator.hpp b/source/emulator.hpp
@@ -24,6 +24,10 @@ class Emulator
   // Constructor must only do configuration parsing to perform dry runs
   Emulator(const nlohmann::json &config)
   {
+    // Getting disabled state properties
+    const auto disabledStateProperties = jaffarCommon::json::getArray<std::string>(config, "Disabled State Properties");
+    for (const auto &property : disabledStateProperties) _disabledStateProperties.push_back(property);
+
     // Getting emulator name (for runtime use)
     _emulatorName = jaffarCommon::json::getString(config, "Emulator Name");
   };