summaryrefslogtreecommitdiffstats
path: root/src/yuzu_cmd
diff options
context:
space:
mode:
authorfearlessTobi <thm.frey@gmail.com>2018-08-21 01:14:06 +0200
committerfearlessTobi <thm.frey@gmail.com>2018-08-21 01:14:06 +0200
commitba8ff096fdc9f7ab101851c4cd06c3244a7d84c3 (patch)
tree927b7495e2674a375aca8a4b004907e8af76c638 /src/yuzu_cmd
parentMerge pull request #1104 from Subv/instanced_arrays (diff)
downloadyuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar.gz
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar.bz2
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar.lz
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar.xz
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.tar.zst
yuzu-ba8ff096fdc9f7ab101851c4cd06c3244a7d84c3.zip
Diffstat (limited to 'src/yuzu_cmd')
-rw-r--r--src/yuzu_cmd/config.cpp5
-rw-r--r--src/yuzu_cmd/default_ini.h12
2 files changed, 11 insertions, 6 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 9bf26717f..a95580152 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -96,8 +96,9 @@ void Config::ReadValues() {
// Renderer
Settings::values.resolution_factor =
(float)sdl2_config->GetReal("Renderer", "resolution_factor", 1.0);
- Settings::values.toggle_framelimit =
- sdl2_config->GetBoolean("Renderer", "toggle_framelimit", true);
+ Settings::values.use_frame_limit = sdl2_config->GetBoolean("Renderer", "use_frame_limit", true);
+ Settings::values.frame_limit =
+ static_cast<u16>(sdl2_config->GetInteger("Renderer", "frame_limit", 100));
Settings::values.use_accurate_framebuffers =
sdl2_config->GetBoolean("Renderer", "use_accurate_framebuffers", false);
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index 9a935a0d5..6ed9e7962 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -102,6 +102,14 @@ resolution_factor =
# 0 (default): Off, 1: On
use_vsync =
+# Turns on the frame limiter, which will limit frames output to the target game speed
+# 0: Off, 1: On (default)
+use_frame_limit =
+
+# Limits the speed of the game to run no faster than this value as a percentage of target speed
+# 1 - 9999: Speed limit as a percentage of target game speed. 100 (default)
+frame_limit =
+
# Whether to use accurate framebuffers
# 0 (default): Off (fast), 1 : On (slow)
use_accurate_framebuffers =
@@ -132,10 +140,6 @@ custom_bottom_top =
custom_bottom_right =
custom_bottom_bottom =
-# Whether to toggle frame limiter on or off.
-# 0: Off, 1 (default): On
-toggle_framelimit =
-
# Swaps the prominent screen with the other screen.
# For example, if Single Screen is chosen, setting this to 1 will display the bottom screen instead of the top screen.
# 0 (default): Top Screen is prominent, 1: Bottom Screen is prominent