diff --git a/emulators/quickerGPGX/quickerGPGX.hpp b/emulators/quickerGPGX/quickerGPGX.hpp index f7e0108a..e09166f3 100644 --- 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(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 index 7373133b..fde2a7ab 100644 --- 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(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 index 6b5e373e..1db205b0 100644 --- 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(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 index 8d1528ee..15b549a2 100644 --- 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(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 index e087ac04..8572abcf 100644 --- 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(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 index 42fdacf2..730dcb8a 100644 --- 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(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 index 174c5a69..604dfe8f 100644 --- 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(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"); };