From f4622315cfe88c9630aed4e616733a1fa3767b6c Mon Sep 17 00:00:00 2001
From: Raildex <n@a>
Date: Tue, 3 Aug 2021 06:54:26 +0200
Subject: [PATCH] Fixed Climb Out Of Water towards -X

---
 TR5Main/Game/collide.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TR5Main/Game/collide.cpp b/TR5Main/Game/collide.cpp
index b16f8eca2..eb28f853f 100644
--- a/TR5Main/Game/collide.cpp
+++ b/TR5Main/Game/collide.cpp
@@ -2416,7 +2416,7 @@ Vector2 GetOrthogonalIntersect(int xPos, int zPos, int radius, short yRot)
 {
 	Vector2 vect;
 
-	int xGrid = xPos - (xPos % WALL_SIZE);
+	int xGrid = xPos - ((xPos) % WALL_SIZE);
 	int zGrid = zPos - (zPos % WALL_SIZE);
 
 	int dir = (unsigned short)(yRot + ANGLE(45)) / ANGLE(90);
@@ -2432,7 +2432,7 @@ Vector2 GetOrthogonalIntersect(int xPos, int zPos, int radius, short yRot)
 		zPos = zGrid + radius;
 		break;
 	case WEST:
-		xPos = xGrid + radius;
+		xPos = xGrid - (WALL_SIZE - 1) + radius;
 		break;
 	}