diff options
author | archshift <admin@archshift.com> | 2014-10-25 12:54:44 -0700 |
---|---|---|
committer | archshift <admin@archshift.com> | 2014-10-27 18:35:21 -0700 |
commit | 0783498f570e7d5c00174cd10a3c1ff105d1eae6 (patch) | |
tree | 10f64506a8f5111f56c4db17c95f6aba19baf0b9 /src/citra | |
parent | a7a57c04c6448081d5745283de134db56702b344 (diff) |
Use configuration files to enable or disable the new dyncom interpreter.
Diffstat (limited to 'src/citra')
-rw-r--r-- | src/citra/config.cpp | 6 | ||||
-rw-r--r-- | src/citra/config.h | 1 | ||||
-rw-r--r-- | src/citra/default_ini.h | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 03a0ce60..3e5e986c 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -7,6 +7,7 @@ #include "citra/default_ini.h" #include "common/file_util.h" #include "core/settings.h" +#include "core/core.h" #include "config.h" @@ -55,6 +56,10 @@ void Config::ReadControls() { Settings::values.pad_sright_key = glfw_config->GetInteger("Controls", "pad_sright", GLFW_KEY_RIGHT); } +void Config::ReadCore() { + Settings::values.cpu_core = glfw_config->GetInteger("Core", "cpu_core", Core::CPU_Interpreter); +} + void Config::ReadData() { Settings::values.use_virtual_sd = glfw_config->GetBoolean("Data Storage", "use_virtual_sd", true); } @@ -62,6 +67,7 @@ void Config::ReadData() { void Config::Reload() { LoadINI(glfw_config, glfw_config_loc.c_str(), DefaultINI::glfw_config_file); ReadControls(); + ReadCore(); ReadData(); } diff --git a/src/citra/config.h b/src/citra/config.h index c4fac245..4f655187 100644 --- a/src/citra/config.h +++ b/src/citra/config.h @@ -16,6 +16,7 @@ class Config { bool LoadINI(INIReader* config, const char* location, const std::string& default_contents="", bool retry=true); void ReadControls(); + void ReadCore(); void ReadData(); public: Config(); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index e7e45f4a..4a016d48 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -26,6 +26,9 @@ pad_sdown = pad_sleft = pad_sright = +[Core] +cpu_core = ## 0: Interpreter (default), 1: DynCom Interpreter + [Data Storage] use_virtual_sd = )"; |