diff options
| author | 2014-10-25 12:54:44 -0700 | |
|---|---|---|
| committer | 2014-10-27 18:35:21 -0700 | |
| commit | 0783498f570e7d5c00174cd10a3c1ff105d1eae6 (patch) | |
| tree | 10f64506a8f5111f56c4db17c95f6aba19baf0b9 /src/citra/config.cpp | |
| parent | Merge pull request #150 from lioncash/typo (diff) | |
| download | yuzu-0783498f570e7d5c00174cd10a3c1ff105d1eae6.tar.gz yuzu-0783498f570e7d5c00174cd10a3c1ff105d1eae6.tar.xz yuzu-0783498f570e7d5c00174cd10a3c1ff105d1eae6.zip | |
Use configuration files to enable or disable the new dyncom interpreter.
Diffstat (limited to 'src/citra/config.cpp')
| -rw-r--r-- | src/citra/config.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 03a0ce606..3e5e986c2 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include "citra/default_ini.h" | 7 | #include "citra/default_ini.h" |
| 8 | #include "common/file_util.h" | 8 | #include "common/file_util.h" |
| 9 | #include "core/settings.h" | 9 | #include "core/settings.h" |
| 10 | #include "core/core.h" | ||
| 10 | 11 | ||
| 11 | #include "config.h" | 12 | #include "config.h" |
| 12 | 13 | ||
| @@ -55,6 +56,10 @@ void Config::ReadControls() { | |||
| 55 | Settings::values.pad_sright_key = glfw_config->GetInteger("Controls", "pad_sright", GLFW_KEY_RIGHT); | 56 | Settings::values.pad_sright_key = glfw_config->GetInteger("Controls", "pad_sright", GLFW_KEY_RIGHT); |
| 56 | } | 57 | } |
| 57 | 58 | ||
| 59 | void Config::ReadCore() { | ||
| 60 | Settings::values.cpu_core = glfw_config->GetInteger("Core", "cpu_core", Core::CPU_Interpreter); | ||
| 61 | } | ||
| 62 | |||
| 58 | void Config::ReadData() { | 63 | void Config::ReadData() { |
| 59 | Settings::values.use_virtual_sd = glfw_config->GetBoolean("Data Storage", "use_virtual_sd", true); | 64 | Settings::values.use_virtual_sd = glfw_config->GetBoolean("Data Storage", "use_virtual_sd", true); |
| 60 | } | 65 | } |
| @@ -62,6 +67,7 @@ void Config::ReadData() { | |||
| 62 | void Config::Reload() { | 67 | void Config::Reload() { |
| 63 | LoadINI(glfw_config, glfw_config_loc.c_str(), DefaultINI::glfw_config_file); | 68 | LoadINI(glfw_config, glfw_config_loc.c_str(), DefaultINI::glfw_config_file); |
| 64 | ReadControls(); | 69 | ReadControls(); |
| 70 | ReadCore(); | ||
| 65 | ReadData(); | 71 | ReadData(); |
| 66 | } | 72 | } |
| 67 | 73 | ||