diff options
| author | 2017-01-13 12:04:27 -0500 | |
|---|---|---|
| committer | 2017-01-13 12:04:27 -0500 | |
| commit | ba271f65698a322f6cb125ac11bcb4c8bda0068d (patch) | |
| tree | e6c2ef23a944828bed5f433c47b93e9a4f8736e1 /src | |
| parent | Merge pull request #2424 from Kloen/qt-ui-warnings-really (diff) | |
| parent | SDL2: Config.cpp fix double to float warning (diff) | |
| download | yuzu-ba271f65698a322f6cb125ac11bcb4c8bda0068d.tar.gz yuzu-ba271f65698a322f6cb125ac11bcb4c8bda0068d.tar.xz yuzu-ba271f65698a322f6cb125ac11bcb4c8bda0068d.zip | |
Merge pull request #2423 from Kloen/floats-should-be-float
SDL2: Config, fix double to float warning
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/config.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index bd8ac563b..1d0faf193 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp | |||
| @@ -63,7 +63,8 @@ void Config::ReadValues() { | |||
| 63 | // Renderer | 63 | // Renderer |
| 64 | Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true); | 64 | Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true); |
| 65 | Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true); | 65 | Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true); |
| 66 | Settings::values.resolution_factor = sdl2_config->GetReal("Renderer", "resolution_factor", 1.0); | 66 | Settings::values.resolution_factor = |
| 67 | (float)sdl2_config->GetReal("Renderer", "resolution_factor", 1.0); | ||
| 67 | Settings::values.use_vsync = sdl2_config->GetBoolean("Renderer", "use_vsync", false); | 68 | Settings::values.use_vsync = sdl2_config->GetBoolean("Renderer", "use_vsync", false); |
| 68 | Settings::values.toggle_framelimit = | 69 | Settings::values.toggle_framelimit = |
| 69 | sdl2_config->GetBoolean("Renderer", "toggle_framelimit", true); | 70 | sdl2_config->GetBoolean("Renderer", "toggle_framelimit", true); |