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

3 files changed, 6 insertions, 6 deletions

diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index cc7d0755d..c8734fab4 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;
     }
 
diff --git a/src/port/interpolation/FrameInterpolation.cpp b/src/port/interpolation/FrameInterpolation.cpp
index 3d1512f55..d0e0fe0f0 100644
--- a/src/port/interpolation/FrameInterpolation.cpp
+++ b/src/port/interpolation/FrameInterpolation.cpp
@@ -565,7 +565,7 @@ void FrameInterpolation_StartRecord(void) {
         is_recording = false;
         return;
     }
-    if (GameEngine::GetInterpolationFPS() != 20) {
+    if (GameEngine::GetInterpolationFPS() != 30) {
         is_recording = true;
     }
 }
diff --git a/src/port/ui/PortMenu.cpp b/src/port/ui/PortMenu.cpp
index 6f2a4ec48..cb709e16b 100644
--- a/src/port/ui/PortMenu.cpp
+++ b/src/port/ui/PortMenu.cpp
@@ -258,11 +258,11 @@ void PortMenu::AddSettings() {
             if (mPortMenu->disabledMap.at(DISABLE_FOR_MATCH_REFRESH_RATE_ON).active)
                 info.activeDisables.push_back(DISABLE_FOR_MATCH_REFRESH_RATE_ON);
         })
-        .Options(IntSliderOptions().Tooltip(tooltip).Min(20).Max(maxFps).DefaultValue(20));
+        .Options(IntSliderOptions().Tooltip(tooltip).Min(30).Max(maxFps).DefaultValue(30));
     AddWidget(path, "Match Refresh Rate", WIDGET_BUTTON)
         .Callback([](WidgetInfo& info) {
             int hz = Ship::Context::GetInstance()->GetWindow()->GetCurrentRefreshRate();
-            if (hz >= 20 && hz <= 360) {
+            if (hz >= 30 && hz <= 360) {
                 CVarSetInteger("gInterpolationFPS", hz);
                 Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
             }