From aba8eed3f086fc03ba5ba95afc38ab78f8dbd48d Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Tue, 31 Oct 2023 09:54:15 -0300
Subject: [PATCH] fix merge

---
 src/code/z_kankyo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 0326dcd24..67329548a 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -1874,7 +1874,7 @@ void Environment_DrawLensFlare(PlayState* play, EnvironmentContext* envCtx, View
 
     OPEN_DISPS(gfxCtx);
 
-    dist = Math3D_Distance(&pos, &view->eye) / 12.0f;
+    dist = Math3D_Vec3f_DistXYZ(&pos, &view->eye) / 12.0f;
 
     // compute a unit vector in the look direction
     tempX = view->at.x - view->eye.x;