From 5b306b2a17bc0b8d8b1cabec808a9c42d0eb9123 Mon Sep 17 00:00:00 2001
From: Agent X <44549182+Agent-11@users.noreply.github.com>
Date: Sun, 12 Nov 2023 09:53:27 -0500
Subject: [PATCH] Fix free cam being offset by instant warps

---
 src/game/camera.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/game/camera.c b/src/game/camera.c
index e2190c286..ca55284b7 100644
--- a/src/game/camera.c
+++ b/src/game/camera.c
@@ -5533,10 +5533,12 @@ void warp_camera(f32 displacementX, f32 displacementY, f32 displacementZ) {
     vec3f_add(gLakituState.goalFocus, displacement);
     marioStates->waterLevel += displacementY;
 
-    vec3f_add(start->focus, displacement);
-    vec3f_add(start->pos, displacement);
-    vec3f_add(end->focus, displacement);
-    vec3f_add(end->pos, displacement);
+    if (gLakituState.mode != CAMERA_MODE_NEWCAM) {
+        vec3f_add(start->focus, displacement);
+        vec3f_add(start->pos, displacement);
+        vec3f_add(end->focus, displacement);
+        vec3f_add(end->pos, displacement);
+    }
     skip_camera_interpolation();
 }