diff --git a/Core/GameEngine/Source/Common/FramePacer.cpp b/Core/GameEngine/Source/Common/FramePacer.cpp index fd754b1d9f7..c9cfea837b9 100644 --- a/Core/GameEngine/Source/Common/FramePacer.cpp +++ b/Core/GameEngine/Source/Common/FramePacer.cpp @@ -64,7 +64,8 @@ void FramePacer::setFramesPerSecondLimit( Int fps ) // clamp FPS to at least render at same as logic #if defined(GENERALS_ONLINE) - fps = std::max(fps, GENERALS_ONLINE_HIGH_FPS_LIMIT); + bool bIsInGame = (TheGameLogic != nullptr && TheGameLogic->isInGame() && !TheGameLogic->isInShellGame() && !TheGameLogic->isInReplayGame()); + fps = std::max(fps, bIsInGame ? 70 : GENERALS_ONLINE_HIGH_FPS_LIMIT); #endif m_maxFPS = fps; diff --git a/Core/GameEngine/Source/Common/FrameRateLimit.cpp b/Core/GameEngine/Source/Common/FrameRateLimit.cpp index fce58ed1936..ab025faa8ea 100644 --- a/Core/GameEngine/Source/Common/FrameRateLimit.cpp +++ b/Core/GameEngine/Source/Common/FrameRateLimit.cpp @@ -60,7 +60,7 @@ Real FrameRateLimit::wait(UnsignedInt maxFps) const UnsignedInt RenderFpsPreset::s_fpsValues[] = { #if defined(GENERALS_ONLINE) && defined(GENERALS_ONLINE_HIGH_FPS_SERVER) - 60, 65, 70, 72, 75, 80, 85, 90, 100, 110, 120, 144, 240, 480, UncappedFpsValue }; + 70, 72, 75, 80, 85, 90, 100, 110, 120, 144, 240, 480, UncappedFpsValue }; #else 30, 50, 56, 60, 65, 70, 72, 75, 80, 85, 90, 100, 110, 120, 144, 240, 480, UncappedFpsValue }; #endif