Merge branch 'transformfuncsforint' of https://github.com/HarbourMasters/SpaghettiKart into transformfuncsforint

1 files changed, 4 insertions, 4 deletions

diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index cc7d0755d..15acab0ac 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -233,10 +233,10 @@ uint32_t GameEngine::GetInterpolationFPS() {
     } else if (CVarGetInteger("gVsyncEnabled", 1) ||
                !Ship::Context::GetInstance()->GetWindow()->CanDisableVerticalSync()) {
         return std::min<uint32_t>(Ship::Context::GetInstance()->GetWindow()->GetCurrentRefreshRate(),
-                                  CVarGetInteger("gInterpolationFPS", 60));
+                                  CVarGetInteger("gInterpolationFPS", 30));
     }
 
-    return CVarGetInteger("gInterpolationFPS", 60);
+    return CVarGetInteger("gInterpolationFPS", 30);
 }
 
 uint32_t GameEngine::GetInterpolationFrameCount()
@@ -360,7 +360,7 @@ void GameEngine::ProcessGfxCommands(Gfx* commands) {
     int fps = target_fps;
     int original_fps = 60 / 2 /*gVIsPerFrame*/;
 
-    if (target_fps == 20 || original_fps > target_fps) {
+    if (target_fps == 30 || original_fps > target_fps) {
         fps = original_fps;
     }
 
@@ -385,7 +385,7 @@ void GameEngine::ProcessGfxCommands(Gfx* commands) {
 
     auto wnd = std::dynamic_pointer_cast<Fast::Fast3dWindow>(Ship::Context::GetInstance()->GetWindow());
     if (wnd != nullptr) {
-        wnd->SetTargetFps(CVarGetInteger("gInterpolationFPS", 30));
+        wnd->SetTargetFps(GetInterpolationFPS());
         wnd->SetMaximumFrameLatency(1);
     }
     RunCommands(commands, mtx_replacements);