diff options
author | bunnei <bunneidev@gmail.com> | 2014-11-30 23:17:45 -0500 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-11-30 23:17:45 -0500 |
commit | 1827bb1fcc66b9578002bdfc627603cd945618e8 (patch) | |
tree | 5eb27c9e3bc9e547c4aca271cfc0998930933bae /src/citra/config.cpp | |
parent | e3d1ffff4be6312ef2f25321cf4100748a7cd0b2 (diff) | |
parent | 06c9712bc77d800877bb38d1a879536761d358c0 (diff) |
Merge pull request #196 from archshift/settings
Merge Config::ReadXYZs
Diffstat (limited to 'src/citra/config.cpp')
-rw-r--r-- | src/citra/config.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index f45d09fc..1f8f5922 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -36,7 +36,8 @@ bool Config::LoadINI(INIReader* config, const char* location, const std::string& return true; } -void Config::ReadControls() { +void Config::ReadValues() { + // Controls Settings::values.pad_a_key = glfw_config->GetInteger("Controls", "pad_a", GLFW_KEY_A); Settings::values.pad_b_key = glfw_config->GetInteger("Controls", "pad_b", GLFW_KEY_S); Settings::values.pad_x_key = glfw_config->GetInteger("Controls", "pad_x", GLFW_KEY_Z); @@ -54,27 +55,21 @@ void Config::ReadControls() { Settings::values.pad_sdown_key = glfw_config->GetInteger("Controls", "pad_sdown", GLFW_KEY_DOWN); Settings::values.pad_sleft_key = glfw_config->GetInteger("Controls", "pad_sleft", GLFW_KEY_LEFT); Settings::values.pad_sright_key = glfw_config->GetInteger("Controls", "pad_sright", GLFW_KEY_RIGHT); -} -void Config::ReadCore() { + // Core Settings::values.cpu_core = glfw_config->GetInteger("Core", "cpu_core", Core::CPU_Interpreter); Settings::values.gpu_refresh_rate = glfw_config->GetInteger("Core", "gpu_refresh_rate", 60); -} -void Config::ReadData() { + // Data Storage Settings::values.use_virtual_sd = glfw_config->GetBoolean("Data Storage", "use_virtual_sd", true); -} -void Config::ReadMiscellaneous() { + // Miscellaneous Settings::values.enable_log = glfw_config->GetBoolean("Miscellaneous", "enable_log", true); } void Config::Reload() { LoadINI(glfw_config, glfw_config_loc.c_str(), DefaultINI::glfw_config_file); - ReadControls(); - ReadCore(); - ReadData(); - ReadMiscellaneous(); + ReadValues(); } Config::~Config() { |