From d4ec446141f00383a6ca3a22a692c81c5436511a Mon Sep 17 00:00:00 2001
From: wang ryu <3357032-bzzt@users.noreply.gitlab.com>
Date: Thu, 10 Jan 2019 15:20:21 +0000
Subject: [PATCH] default framelimit

---
 docs/source/reference/modding/settings/video.rst | 4 +---
 files/settings-default.cfg                       | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/source/reference/modding/settings/video.rst b/docs/source/reference/modding/settings/video.rst
index a8a95739ea..040b9948f7 100644
--- a/docs/source/reference/modding/settings/video.rst
+++ b/docs/source/reference/modding/settings/video.rst
@@ -140,7 +140,7 @@ framerate limit
 
 :Type:		floating point
 :Range:		>= 0.0
-:Default:	0.0
+:Default:	300
 
 This setting determines the maximum frame rate in frames per second.
 If this setting is 0.0, the frame rate is unlimited.
@@ -159,8 +159,6 @@ in the sense that enabling vertical sync limits the frame rate to the refresh ra
 Choosing to limit the frame rate using this setting instead of vsync may reduce input lag
 due to the game not having to wait for the vertical blanking interval.
 
-This setting can only be configured by editing the settings configuration file.
-
 contrast
 --------
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 71a93d1a2c..562fb13f74 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -417,7 +417,7 @@ antialiasing = 0
 vsync = false
 
 # Maximum frames per second. 0.0 is unlimited, or >0.0 to limit.
-framerate limit = 0.0
+framerate limit = 300
 
 # Game video contrast.  (>0.0).  No effect in Linux.
 contrast = 1.0