From 8c1f4ba65d1a037fa442f489f5d542eed42edcab Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Mon, 18 Jan 2021 23:59:07 +0300
Subject: [PATCH 1/2] fix

---
 src/control/Script4.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/control/Script4.cpp b/src/control/Script4.cpp
index d17334a9..ecbb337a 100644
--- a/src/control/Script4.cpp
+++ b/src/control/Script4.cpp
@@ -1417,7 +1417,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		script_assert(pVehicle);
 		const CVector& pos = pVehicle->GetPosition();
-		float heading = CGeneral::GetATanOfXY(pos.y - *(float*)&ScriptParams[2], pos.x - *(float*)&ScriptParams[1]) + HALFPI;
+		float heading = CGeneral::GetATanOfXY(pos.x - *(float*)&ScriptParams[1], pos.y - *(float*)&ScriptParams[2]) + HALFPI;
 		if (heading > TWOPI)
 			heading -= TWOPI;
 		pVehicle->SetHeading(heading);

From 25d3066eae00ea0af66c0ea908f7bbddac806078 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Tue, 19 Jan 2021 12:05:38 +0100
Subject: [PATCH 2/2] fix RWLIBS build without GTA_PS2_STUFF

---
 src/core/Radar.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 816da6b9..ba939fa3 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -1,3 +1,6 @@
+#if !defined(GTA_PS2_STUFF) && defined(RWLIBS)
+#define WITHD3D
+#endif
 #include "config.h"
 #include "common.h"