ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'origin/master' into fixes

Browse Source
This commit is contained in:
Flakebi
2015-03-08 01:16:51 +01:00
parent f386f05749 33feb60d7a
commit e5abf4cec3
160 changed files with 2204 additions and 1943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main_loop.cpp
View File

@@ -76,7 +76,7 @@ float MainLoop::getLimitedDt()
// Throttle fps if more than maximum, which can reduce
// the noise the fan on a graphics card makes.
// When in menus, reduce FPS much, it's not necessary to push to the maximum for plain menus
const int max_fps = (StateManager::get()->throttleFPS() ? 35 : UserConfigParams::m_max_fps);
const int max_fps = (StateManager::get()->throttleFPS() ? 30 : UserConfigParams::m_max_fps);
const int current_fps = (int)(1000.0f/dt);
if (m_throttle_fps && current_fps > max_fps && !ProfileWorld::isProfileMode())
{