From 202c4078fc4e62caf83b1af27bc602490fb5cdc6 Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Sat, 6 Jan 2024 15:28:03 +0100 Subject: [PATCH] lighting: Fix merge conflict --- src/display3d.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/display3d.cpp b/src/display3d.cpp index 3e30bb449dd..429ae4ac121 100644 --- a/src/display3d.cpp +++ b/src/display3d.cpp @@ -1395,7 +1395,6 @@ static void drawTiles(iView *player, LightingData& lightData, LightMap& lightmap tileScreenInfo[idx][jdx].z = pie_RotateProjectWithPerspective(&pos, tileCalcPerspectiveViewMatrix, &screen); tileScreenInfo[idx][jdx].x = screen.x; tileScreenInfo[idx][jdx].y = screen.y; ->>>>>>> 57d397b33ec953c53feaca70743356cca61d0b61 } }