12 files changed, 1382 insertions, 1345 deletions

diff --git a/src/core/Clock.h b/src/core/Clock.h
index ea4263bd..6b9908ba 100644
--- a/src/core/Clock.h
+++ b/src/core/Clock.h
@@ -2,6 +2,7 @@
 
 class CClock
 {
+public:
 	static uint8  &ms_nGameClockHours;
 	static uint8  &ms_nGameClockMinutes;
 	static uint16 &ms_nGameClockSeconds;
@@ -11,7 +12,6 @@ class CClock
 	static uint32 &ms_nMillisecondsPerGameMinute;
 	static uint32 &ms_nLastClockTick;
 	static bool   &ms_bClockHasBeenStored;
-public:
 
 	static void Initialise(uint32 scale);
 	static void Update(void);
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
index 8e66b049..75536b88 100644
--- a/src/core/Pools.cpp
+++ b/src/core/Pools.cpp
@@ -14,6 +14,13 @@ CObjectPool *&CPools::ms_pObjectPool = *(CObjectPool**)0x880E28;
 CDummyPool *&CPools::ms_pDummyPool = *(CDummyPool**)0x8F2C18;
 CAudioScriptObjectPool *&CPools::ms_pAudioScriptObjectPool = *(CAudioScriptObjectPool**)0x8F1B6C;
 
+WRAPPER void CPools::LoadObjectPool(uint8* buf, uint32 size) { EAXJMP(0x4a2550); }
+WRAPPER void CPools::LoadPedPool(uint8* buf, uint32 size) { EAXJMP(0x4a2b50); }
+WRAPPER void CPools::LoadVehiclePool(uint8* buf, uint32 size) { EAXJMP(0x4a1b40); }
+WRAPPER void CPools::SaveObjectPool(uint8* buf, uint32 *size) { EAXJMP(0x4a22d0); }
+WRAPPER void CPools::SavePedPool(uint8* buf, uint32 *size) { EAXJMP(0x4a29b0); }
+WRAPPER void CPools::SaveVehiclePool(uint8* buf, uint32 *size) { EAXJMP(0x4a2080); }
+
 void
 CPools::Initialise(void)
 {
@@ -30,16 +37,16 @@ CPools::Initialise(void)
 
 void
 CPools::ShutDown(void)
-{

-	debug("PtrNodes left %d\n", ms_pPtrNodePool->GetNoOfUsedSpaces());

-	debug("EntryInfoNodes left %d\n", ms_pEntryInfoNodePool->GetNoOfUsedSpaces());

-	debug("Peds left %d\n", ms_pPedPool->GetNoOfUsedSpaces());

-	debug("Vehicles left %d\n", ms_pVehiclePool->GetNoOfUsedSpaces());

-	debug("Buildings left %d\n", ms_pBuildingPool->GetNoOfUsedSpaces());

-	debug("Treadables left %d\n", ms_pTreadablePool->GetNoOfUsedSpaces());

-	debug("Objects left %d\n", ms_pObjectPool->GetNoOfUsedSpaces());

-	debug("Dummys left %d\n", ms_pDummyPool->GetNoOfUsedSpaces());

-	debug("AudioScriptObjects left %d\n", ms_pAudioScriptObjectPool->GetNoOfUsedSpaces());

+{
+	debug("PtrNodes left %d\n", ms_pPtrNodePool->GetNoOfUsedSpaces());
+	debug("EntryInfoNodes left %d\n", ms_pEntryInfoNodePool->GetNoOfUsedSpaces());
+	debug("Peds left %d\n", ms_pPedPool->GetNoOfUsedSpaces());
+	debug("Vehicles left %d\n", ms_pVehiclePool->GetNoOfUsedSpaces());
+	debug("Buildings left %d\n", ms_pBuildingPool->GetNoOfUsedSpaces());
+	debug("Treadables left %d\n", ms_pTreadablePool->GetNoOfUsedSpaces());
+	debug("Objects left %d\n", ms_pObjectPool->GetNoOfUsedSpaces());
+	debug("Dummys left %d\n", ms_pDummyPool->GetNoOfUsedSpaces());
+	debug("AudioScriptObjects left %d\n", ms_pAudioScriptObjectPool->GetNoOfUsedSpaces());
 	printf("Shutdown pool started\n");
 
 	delete ms_pPtrNodePool;
@@ -62,12 +69,12 @@ CVehicle *CPools::GetVehicle(int32 handle) { return ms_pVehiclePool->GetAt(handl
 int32 CPools::GetObjectRef(CObject *object) { return ms_pObjectPool->GetIndex(object); }
 CObject *CPools::GetObject(int32 handle) { return ms_pObjectPool->GetAt(handle); }
 
-void

-CPools::CheckPoolsEmpty()

-{

-	assert(ms_pPedPool->GetNoOfUsedSpaces() == 0);

-	assert(ms_pVehiclePool->GetNoOfUsedSpaces() == 0);

-	printf("pools have beem cleared \n");

+void
+CPools::CheckPoolsEmpty()
+{
+	assert(ms_pPedPool->GetNoOfUsedSpaces() == 0);
+	assert(ms_pVehiclePool->GetNoOfUsedSpaces() == 0);
+	printf("pools have been cleared\n");
 }
 
 
diff --git a/src/core/Pools.h b/src/core/Pools.h
index 862062ee..74b87585 100644
--- a/src/core/Pools.h
+++ b/src/core/Pools.h
@@ -52,4 +52,10 @@ public:
 	static CObject *GetObject(int32 handle);
 	static void CheckPoolsEmpty();
 	static void MakeSureSlotInObjectPoolIsEmpty(int32 slot);
+	static void LoadObjectPool(uint8 *buf, uint32 size);
+	static void LoadPedPool(uint8 *buf, uint32 size);
+	static void LoadVehiclePool(uint8 *buf, uint32 size);
+	static void SaveObjectPool(uint8 *buf, uint32 *size);
+	static void SavePedPool(uint8 *buf, uint32 *size);
+	static void SaveVehiclePool(uint8 *buf, uint32 *size);
 };
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 4744246d..6421520b 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -1,144 +1,144 @@
-#include "config.h"
-#include "common.h"
-#include "patcher.h"
-#include "RwHelper.h"
-#include "Radar.h"
-#include "Camera.h"
-#include "Hud.h"
-#include "World.h"
-#include "Frontend.h"
-#include "General.h"
-#include "Vehicle.h"
-#include "Pools.h"
-#include "Script.h"
-#include "TxdStore.h"
-#include "World.h"
-#include "Streaming.h"
-#include "SpecialFX.h"
-
-float &CRadar::m_radarRange = *(float*)0x8E281C;
-CBlip (&CRadar::ms_RadarTrace)[NUMRADARBLIPS] = *(CBlip(*)[NUMRADARBLIPS]) * (uintptr*)0x6ED5E0;
-CVector2D &vec2DRadarOrigin = *(CVector2D*)0x6299B8;
-int32 gRadarTxdIds[64];// = (int*)0x6299C0;
-
-CSprite2d CRadar::AsukaSprite;// = *(CSprite2d*)0x8F1A40;
-CSprite2d CRadar::BombSprite;// = (CSprite2d*)0x8F5FB4;
-CSprite2d CRadar::CatSprite;// = (CSprite2d*)0x885B24;
-CSprite2d CRadar::CentreSprite;// = (CSprite2d*)0x8F6268;
-CSprite2d CRadar::CopcarSprite;// = (CSprite2d*)0x8F1A2C;
-CSprite2d CRadar::DonSprite;// = (CSprite2d*)0x8F2BE0;
-CSprite2d CRadar::EightSprite;// = (CSprite2d*)0x8F2BCC;
-CSprite2d CRadar::ElSprite;// = (CSprite2d*)0x8F1B80;
-CSprite2d CRadar::IceSprite;// = (CSprite2d*)0x9415FC;
-CSprite2d CRadar::JoeySprite;// = (CSprite2d*)0x8F2C00;
-CSprite2d CRadar::KenjiSprite;// = (CSprite2d*)0x8F2C68;
-CSprite2d CRadar::LizSprite;// = (CSprite2d*)0x8F5830;
-CSprite2d CRadar::LuigiSprite;// = (CSprite2d*)0x8F1A3C;
-CSprite2d CRadar::NorthSprite;// = (CSprite2d*)0x8F6274;
-CSprite2d CRadar::RaySprite;// = (CSprite2d*)0x8E2A7C;
-CSprite2d CRadar::SalSprite;// = (CSprite2d*)0x8F29EC;
-CSprite2d CRadar::SaveSprite;// = (CSprite2d*)0x8F5F74;
-CSprite2d CRadar::SpraySprite;// = (CSprite2d*)0x94307C;
-CSprite2d CRadar::TonySprite;// = (CSprite2d*)0x885B58;
-CSprite2d CRadar::WeaponSprite;// = (CSprite2d*)0x941534;
-
-CSprite2d *CRadar::RadarSprites[RADAR_SPRITE_COUNT] = { 
-	nil,
-	&AsukaSprite,
-	&BombSprite,
-	&CatSprite,
-	&CentreSprite,
-	&CopcarSprite,
-	&DonSprite,
-	&EightSprite,
-	&ElSprite,
-	&IceSprite,
-	&JoeySprite,
-	&KenjiSprite,
-	&LizSprite,
-	&LuigiSprite,
-	&NorthSprite,
-	&RaySprite,
-	&SalSprite,
-	&SaveSprite,
-	&SpraySprite,
-	&TonySprite,
-	&WeaponSprite
-};
-
-#define RADAR_NUM_TILES (8)
-#define RADAR_TILE_SIZE (WORLD_SIZE_X / RADAR_NUM_TILES)
-static_assert(RADAR_TILE_SIZE == (WORLD_SIZE_Y / RADAR_NUM_TILES), "CRadar: not a square");
-
-#define RADAR_MIN_RANGE (120.0f)
-#define RADAR_MAX_RANGE (350.0f)
-#define RADAR_MIN_SPEED (0.3f)
-#define RADAR_MAX_SPEED (0.9f)
-
-#if 0
-WRAPPER void CRadar::CalculateBlipAlpha(float) { EAXJMP(0x4A4F90); }
-#else
-uint8 CRadar::CalculateBlipAlpha(float dist)
-{
-	if (dist <= 1.0f)
-		return 255;
-
-	if (dist <= 5.0f)
-		return (128.0f * ((dist - 1.0f) / 4.0f)) + ((1.0f - (dist - 1.0f) / 4.0f) * 255.0f);
-
-	return 128;
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::ChangeBlipBrightness(int32, int32) { EAXJMP(0x4A57A0); }
-#else
-void CRadar::ChangeBlipBrightness(int32 i, int32 bright)
-{
+#include "config.h"

+#include "common.h"

+#include "patcher.h"

+#include "RwHelper.h"

+#include "Radar.h"

+#include "Camera.h"

+#include "Hud.h"

+#include "World.h"

+#include "Frontend.h"

+#include "General.h"

+#include "Vehicle.h"

+#include "Pools.h"

+#include "Script.h"

+#include "TxdStore.h"

+#include "World.h"

+#include "Streaming.h"

+#include "SpecialFX.h"

+

+float &CRadar::m_radarRange = *(float*)0x8E281C;

+CBlip (&CRadar::ms_RadarTrace)[NUMRADARBLIPS] = *(CBlip(*)[NUMRADARBLIPS]) * (uintptr*)0x6ED5E0;

+CVector2D &vec2DRadarOrigin = *(CVector2D*)0x6299B8;

+int32 gRadarTxdIds[64];// = (int*)0x6299C0;

+

+CSprite2d CRadar::AsukaSprite;// = *(CSprite2d*)0x8F1A40;

+CSprite2d CRadar::BombSprite;// = (CSprite2d*)0x8F5FB4;

+CSprite2d CRadar::CatSprite;// = (CSprite2d*)0x885B24;

+CSprite2d CRadar::CentreSprite;// = (CSprite2d*)0x8F6268;

+CSprite2d CRadar::CopcarSprite;// = (CSprite2d*)0x8F1A2C;

+CSprite2d CRadar::DonSprite;// = (CSprite2d*)0x8F2BE0;

+CSprite2d CRadar::EightSprite;// = (CSprite2d*)0x8F2BCC;

+CSprite2d CRadar::ElSprite;// = (CSprite2d*)0x8F1B80;

+CSprite2d CRadar::IceSprite;// = (CSprite2d*)0x9415FC;

+CSprite2d CRadar::JoeySprite;// = (CSprite2d*)0x8F2C00;

+CSprite2d CRadar::KenjiSprite;// = (CSprite2d*)0x8F2C68;

+CSprite2d CRadar::LizSprite;// = (CSprite2d*)0x8F5830;

+CSprite2d CRadar::LuigiSprite;// = (CSprite2d*)0x8F1A3C;

+CSprite2d CRadar::NorthSprite;// = (CSprite2d*)0x8F6274;

+CSprite2d CRadar::RaySprite;// = (CSprite2d*)0x8E2A7C;

+CSprite2d CRadar::SalSprite;// = (CSprite2d*)0x8F29EC;

+CSprite2d CRadar::SaveSprite;// = (CSprite2d*)0x8F5F74;

+CSprite2d CRadar::SpraySprite;// = (CSprite2d*)0x94307C;

+CSprite2d CRadar::TonySprite;// = (CSprite2d*)0x885B58;

+CSprite2d CRadar::WeaponSprite;// = (CSprite2d*)0x941534;

+

+CSprite2d *CRadar::RadarSprites[RADAR_SPRITE_COUNT] = { 

+	nil,

+	&AsukaSprite,

+	&BombSprite,

+	&CatSprite,

+	&CentreSprite,

+	&CopcarSprite,

+	&DonSprite,

+	&EightSprite,

+	&ElSprite,

+	&IceSprite,

+	&JoeySprite,

+	&KenjiSprite,

+	&LizSprite,

+	&LuigiSprite,

+	&NorthSprite,

+	&RaySprite,

+	&SalSprite,

+	&SaveSprite,

+	&SpraySprite,

+	&TonySprite,

+	&WeaponSprite

+};

+

+#define RADAR_NUM_TILES (8)

+#define RADAR_TILE_SIZE (WORLD_SIZE_X / RADAR_NUM_TILES)

+static_assert(RADAR_TILE_SIZE == (WORLD_SIZE_Y / RADAR_NUM_TILES), "CRadar: not a square");

+

+#define RADAR_MIN_RANGE (120.0f)

+#define RADAR_MAX_RANGE (350.0f)

+#define RADAR_MIN_SPEED (0.3f)

+#define RADAR_MAX_SPEED (0.9f)

+

+#if 0

+WRAPPER void CRadar::CalculateBlipAlpha(float) { EAXJMP(0x4A4F90); }

+#else

+uint8 CRadar::CalculateBlipAlpha(float dist)

+{

+	if (dist <= 1.0f)

+		return 255;

+

+	if (dist <= 5.0f)

+		return (128.0f * ((dist - 1.0f) / 4.0f)) + ((1.0f - (dist - 1.0f) / 4.0f) * 255.0f);

+

+	return 128;

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::ChangeBlipBrightness(int32, int32) { EAXJMP(0x4A57A0); }

+#else

+void CRadar::ChangeBlipBrightness(int32 i, int32 bright)

+{

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

-		ms_RadarTrace[index].m_bDim = bright != 1;
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::ChangeBlipColour(int32, int32) { EAXJMP(0x4A5770); }
-#else
-void CRadar::ChangeBlipColour(int32 i, int32 color)
-{
+		ms_RadarTrace[index].m_bDim = bright != 1;

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::ChangeBlipColour(int32, int32) { EAXJMP(0x4A5770); }

+#else

+void CRadar::ChangeBlipColour(int32 i, int32 color)

+{

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

-		ms_RadarTrace[index].m_nColor = color;
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::ChangeBlipDisplay(int32, eBlipDisplay) { EAXJMP(0x4A5810); }
-#else
-void CRadar::ChangeBlipDisplay(int32 i, eBlipDisplay display)
-{
+		ms_RadarTrace[index].m_nColor = color;

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::ChangeBlipDisplay(int32, eBlipDisplay) { EAXJMP(0x4A5810); }

+#else

+void CRadar::ChangeBlipDisplay(int32 i, eBlipDisplay display)

+{

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

-		ms_RadarTrace[index].m_eBlipDisplay = display;
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::ChangeBlipScale(int32, int32) { EAXJMP(0x4A57E0); }
-#else
-void CRadar::ChangeBlipScale(int32 i, int32 scale)
-{
+		ms_RadarTrace[index].m_eBlipDisplay = display;

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::ChangeBlipScale(int32, int32) { EAXJMP(0x4A57E0); }

+#else

+void CRadar::ChangeBlipScale(int32 i, int32 scale)

+{

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

-		ms_RadarTrace[index].m_wScale = scale;
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::ClearBlip(int32) { EAXJMP(0x4A5720); }
-#else
-void CRadar::ClearBlip(int32 i)
-{
+		ms_RadarTrace[index].m_wScale = scale;

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::ClearBlip(int32) { EAXJMP(0x4A5720); }

+#else

+void CRadar::ClearBlip(int32 i)

+{

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1) {

 		SetRadarMarkerState(index, false);

@@ -146,127 +146,127 @@ void CRadar::ClearBlip(int32 i)
 		ms_RadarTrace[index].m_eBlipType = BLIP_NONE;

 		ms_RadarTrace[index].m_eBlipDisplay = BLIP_DISPLAY_NEITHER;

 		ms_RadarTrace[index].m_IconID = RADAR_SPRITE_NONE;

-	}
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::ClearBlipForEntity(eBlipType, int32) { EAXJMP(0x4A56C0); }
-#else
-void CRadar::ClearBlipForEntity(eBlipType type, int32 id)
-{
-	for (int i = 0; i < NUMRADARBLIPS; i++) {
-		if (type == ms_RadarTrace[i].m_eBlipType && id == ms_RadarTrace[i].m_nEntityHandle) {
-			SetRadarMarkerState(i, false);
-			ms_RadarTrace[i].m_bInUse = false;
-			ms_RadarTrace[i].m_eBlipType = BLIP_NONE;
-			ms_RadarTrace[i].m_eBlipDisplay = BLIP_DISPLAY_NEITHER;
-			ms_RadarTrace[i].m_IconID = RADAR_SPRITE_NONE;
-		}
-	};
-}
-#endif
-
-#if 0
-WRAPPER int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *in) { EAXJMP(0x4A64A0); }
-#else
-// Why not a proper clipping algorithm?
-int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *rect)
-{
-	CVector2D corners[4] = {
-		{  1.0f, -1.0f },	// top right
-		{  1.0f,  1.0f },	// bottom right
-		{ -1.0f,  1.0f },	// bottom left
-		{ -1.0f, -1.0f },	// top left
-	};
-	CVector2D tmp;
-	int i, j, n;
-	int laste, e, e1, e2;;
-	bool inside[4];
-
-	for (i = 0; i < 4; i++)
-		inside[i] = IsPointInsideRadar(rect[i]);
-
-	laste = -1;
-	n = 0;
-	for (i = 0; i < 4; i++)
-		if (inside[i]) {
-			// point is inside, just add
-			poly[n++] = rect[i];
-		}
-		else {
-			// point is outside but line to this point might be clipped
-			e1 = LineRadarBoxCollision(poly[n], rect[i], rect[(i + 4 - 1) % 4]);
-			if (e1 != -1) {
-				laste = e1;
-				n++;
-			}
-			// and line from this point might be clipped as well
-			e2 = LineRadarBoxCollision(poly[n], rect[i], rect[(i + 1) % 4]);
-			if (e2 != -1) {
-				if (e1 == -1) {
-					// if other line wasn't clipped, i.e. it was complete outside,
-					// we may have to insert another vertex if last clipped line
-					// was on a different edge
-
-					// find the last intersection if we haven't seen it yet
-					if (laste == -1)
-						for (j = 3; j >= i; j--) {
-							// game uses an if here for j == 0
-							e = LineRadarBoxCollision(tmp, rect[j], rect[(j + 4 - 1) % 4]);
-							if (e != -1) {
-								laste = e;
-								break;
-							}
-						}
-					assert(laste != -1);
-
-					// insert corners that were skipped
-					tmp = poly[n];
-					for (e = laste; e != e2; e = (e + 1) % 4)
-						poly[n++] = corners[e];
-					poly[n] = tmp;
-				}
-				n++;
-			}
-		}
-
-	if (n == 0) {
-		// If no points, either the rectangle is completely outside or completely surrounds the radar
-		// no idea what's going on here...
-		float m = (rect[0].y - rect[1].y) / (rect[0].x - rect[1].x);
-		if ((m*rect[3].x - rect[3].y) * (m*rect[0].x - rect[0].y) < 0.0f) {
-			m = (rect[0].y - rect[3].y) / (rect[0].x - rect[3].x);
-			if ((m*rect[1].x - rect[1].y) * (m*rect[0].x - rect[0].y) < 0.0f) {
-				poly[0] = corners[0];
-				poly[1] = corners[1];
-				poly[2] = corners[2];
-				poly[3] = corners[3];
-				n = 4;
-			}
-		}
-	}
-
-	return n;
-}
-#endif
-
-bool CRadar::DisplayThisBlip(int32 counter)
-{
-	switch (ms_RadarTrace[counter].m_IconID) {
-	case RADAR_SPRITE_BOMB:
-	case RADAR_SPRITE_SPRAY:
-	case RADAR_SPRITE_WEAPON:
-		return true;
-	default:
-		return false;
-	}
-}
-
-#if 0
-WRAPPER void CRadar::Draw3dMarkers() { EAXJMP(0x4A4C70); }
-#else
-void CRadar::Draw3dMarkers()
+	}

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::ClearBlipForEntity(eBlipType, int32) { EAXJMP(0x4A56C0); }

+#else

+void CRadar::ClearBlipForEntity(eBlipType type, int32 id)

+{

+	for (int i = 0; i < NUMRADARBLIPS; i++) {

+		if (type == ms_RadarTrace[i].m_eBlipType && id == ms_RadarTrace[i].m_nEntityHandle) {

+			SetRadarMarkerState(i, false);

+			ms_RadarTrace[i].m_bInUse = false;

+			ms_RadarTrace[i].m_eBlipType = BLIP_NONE;

+			ms_RadarTrace[i].m_eBlipDisplay = BLIP_DISPLAY_NEITHER;

+			ms_RadarTrace[i].m_IconID = RADAR_SPRITE_NONE;

+		}

+	};

+}

+#endif

+

+#if 0

+WRAPPER int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *in) { EAXJMP(0x4A64A0); }

+#else

+// Why not a proper clipping algorithm?

+int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *rect)

+{

+	CVector2D corners[4] = {

+		{  1.0f, -1.0f },	// top right

+		{  1.0f,  1.0f },	// bottom right

+		{ -1.0f,  1.0f },	// bottom left

+		{ -1.0f, -1.0f },	// top left

+	};

+	CVector2D tmp;

+	int i, j, n;

+	int laste, e, e1, e2;;

+	bool inside[4];

+

+	for (i = 0; i < 4; i++)

+		inside[i] = IsPointInsideRadar(rect[i]);

+

+	laste = -1;

+	n = 0;

+	for (i = 0; i < 4; i++)

+		if (inside[i]) {

+			// point is inside, just add

+			poly[n++] = rect[i];

+		}

+		else {

+			// point is outside but line to this point might be clipped

+			e1 = LineRadarBoxCollision(poly[n], rect[i], rect[(i + 4 - 1) % 4]);

+			if (e1 != -1) {

+				laste = e1;

+				n++;

+			}

+			// and line from this point might be clipped as well

+			e2 = LineRadarBoxCollision(poly[n], rect[i], rect[(i + 1) % 4]);

+			if (e2 != -1) {

+				if (e1 == -1) {

+					// if other line wasn't clipped, i.e. it was complete outside,

+					// we may have to insert another vertex if last clipped line

+					// was on a different edge

+

+					// find the last intersection if we haven't seen it yet

+					if (laste == -1)

+						for (j = 3; j >= i; j--) {

+							// game uses an if here for j == 0

+							e = LineRadarBoxCollision(tmp, rect[j], rect[(j + 4 - 1) % 4]);

+							if (e != -1) {

+								laste = e;

+								break;

+							}

+						}

+					assert(laste != -1);

+

+					// insert corners that were skipped

+					tmp = poly[n];

+					for (e = laste; e != e2; e = (e + 1) % 4)

+						poly[n++] = corners[e];

+					poly[n] = tmp;

+				}

+				n++;

+			}

+		}

+

+	if (n == 0) {

+		// If no points, either the rectangle is completely outside or completely surrounds the radar

+		// no idea what's going on here...

+		float m = (rect[0].y - rect[1].y) / (rect[0].x - rect[1].x);

+		if ((m*rect[3].x - rect[3].y) * (m*rect[0].x - rect[0].y) < 0.0f) {

+			m = (rect[0].y - rect[3].y) / (rect[0].x - rect[3].x);

+			if ((m*rect[1].x - rect[1].y) * (m*rect[0].x - rect[0].y) < 0.0f) {

+				poly[0] = corners[0];

+				poly[1] = corners[1];

+				poly[2] = corners[2];

+				poly[3] = corners[3];

+				n = 4;

+			}

+		}

+	}

+

+	return n;

+}

+#endif

+

+bool CRadar::DisplayThisBlip(int32 counter)

+{

+	switch (ms_RadarTrace[counter].m_IconID) {

+	case RADAR_SPRITE_BOMB:

+	case RADAR_SPRITE_SPRAY:

+	case RADAR_SPRITE_WEAPON:

+		return true;

+	default:

+		return false;

+	}

+}

+

+#if 0

+WRAPPER void CRadar::Draw3dMarkers() { EAXJMP(0x4A4C70); }

+#else

+void CRadar::Draw3dMarkers()

 {

 	for (int i = 0; i < NUMRADARBLIPS; i++) {

 		if (ms_RadarTrace[i].m_bInUse) {

@@ -315,556 +315,556 @@ void CRadar::Draw3dMarkers()
 				break;

 			}

 		}

-	}
-}
-#endif
-
-
-#if 0
-WRAPPER void CRadar::DrawBlips() { EAXJMP(0x4A42F0); }
-#else
-void CRadar::DrawBlips()
-{
-	if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {
-		RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
-		RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
-		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
-		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
-
-		CVector2D out;
-		CVector2D in = CVector2D(0.0f, 0.0f);
-		TransformRadarPointToScreenSpace(out, in);
-
-		float angle;
-		if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN)
-			angle = PI + FindPlayerHeading();
-#ifdef FIX_BUGS
-		else if (TheCamera.GetLookDirection() != LOOKING_FORWARD)
-			angle = FindPlayerHeading() - (PI + (TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetPosition() - TheCamera.Cams[TheCamera.ActiveCam].SourceBeforeLookBehind).Heading());
-#endif
-		else
-			angle = FindPlayerHeading() - (PI + TheCamera.GetForward().Heading());
-
-		DrawRotatingRadarSprite(&CentreSprite, out.x, out.y, angle, 255);
-
-		CVector2D vec2d;
-		vec2d.x = vec2DRadarOrigin.x;
-		vec2d.y = M_SQRT2 * m_radarRange + vec2DRadarOrigin.y;
-		TransformRealWorldPointToRadarSpace(in, vec2d);
-		LimitRadarPoint(in);
-		TransformRadarPointToScreenSpace(out, in);
-		DrawRadarSprite(RADAR_SPRITE_NORTH, out.x, out.y, 255);
-
-		CEntity *blipEntity = nil;
-		for(int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {
-			if (!ms_RadarTrace[blipId].m_bInUse)
-				continue;
-
-			switch (ms_RadarTrace[blipId].m_eBlipType) {
-				case BLIP_CAR:
-				case BLIP_CHAR:
-				case BLIP_OBJECT:
-					if (ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_BOMB || ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_SAVE
-						|| ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_SPRAY || ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_WEAPON) {
-
-						switch (ms_RadarTrace[blipId].m_eBlipType) {
-							case BLIP_CAR:
-								blipEntity = CPools::GetVehiclePool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);
-								break;
-							case BLIP_CHAR:
+	}

+}

+#endif

+

+

+#if 0

+WRAPPER void CRadar::DrawBlips() { EAXJMP(0x4A42F0); }

+#else

+void CRadar::DrawBlips()

+{

+	if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {

+		RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);

+		RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);

+		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);

+		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);

+		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);

+		RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);

+

+		CVector2D out;

+		CVector2D in = CVector2D(0.0f, 0.0f);

+		TransformRadarPointToScreenSpace(out, in);

+

+		float angle;

+		if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN)

+			angle = PI + FindPlayerHeading();

+#ifdef FIX_BUGS

+		else if (TheCamera.GetLookDirection() != LOOKING_FORWARD)

+			angle = FindPlayerHeading() - (PI + (TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetPosition() - TheCamera.Cams[TheCamera.ActiveCam].SourceBeforeLookBehind).Heading());

+#endif

+		else

+			angle = FindPlayerHeading() - (PI + TheCamera.GetForward().Heading());

+

+		DrawRotatingRadarSprite(&CentreSprite, out.x, out.y, angle, 255);

+

+		CVector2D vec2d;

+		vec2d.x = vec2DRadarOrigin.x;

+		vec2d.y = M_SQRT2 * m_radarRange + vec2DRadarOrigin.y;

+		TransformRealWorldPointToRadarSpace(in, vec2d);

+		LimitRadarPoint(in);

+		TransformRadarPointToScreenSpace(out, in);

+		DrawRadarSprite(RADAR_SPRITE_NORTH, out.x, out.y, 255);

+

+		CEntity *blipEntity = nil;

+		for(int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {

+			if (!ms_RadarTrace[blipId].m_bInUse)

+				continue;

+

+			switch (ms_RadarTrace[blipId].m_eBlipType) {

+				case BLIP_CAR:

+				case BLIP_CHAR:

+				case BLIP_OBJECT:

+					if (ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_BOMB || ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_SAVE

+						|| ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_SPRAY || ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_WEAPON) {

+

+						switch (ms_RadarTrace[blipId].m_eBlipType) {

+							case BLIP_CAR:

+								blipEntity = CPools::GetVehiclePool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);

+								break;

+							case BLIP_CHAR:

 								blipEntity = CPools::GetPedPool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);

 								if (blipEntity != nil) {

 									if (((CPed*)blipEntity)->InVehicle())

 										blipEntity = ((CPed*)blipEntity)->m_pMyVehicle;

-								}
-								break;
-							case BLIP_OBJECT:
-								blipEntity = CPools::GetObjectPool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);
-								break;
-							default:
-								break;
-						}
-						if (blipEntity) {
-							uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);
-							if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
-								if (CTheScripts::IsDebugOn()) {
-									ShowRadarMarker(blipEntity->GetPosition(), color, ms_RadarTrace[blipId].m_Radius);
-									ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f;
-									if (ms_RadarTrace[blipId].m_Radius < 1.0f)
-										ms_RadarTrace[blipId].m_Radius = 5.0f;
-								}
-							}
-							if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BLIP_ONLY) {
-								TransformRealWorldPointToRadarSpace(in, blipEntity->GetPosition());
-								float dist = LimitRadarPoint(in);
-								TransformRadarPointToScreenSpace(out, in);
-								if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_NONE) {
-									DrawRadarSprite(ms_RadarTrace[blipId].m_IconID, out.x, out.y, CalculateBlipAlpha(dist));
-								} else {
-#ifdef TRIANGULAR_BLIPS
-									CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();
-									CVector &blipPos = blipEntity->GetPosition();
-									uint8 mode = BLIP_MODE_TRIANGULAR_UP;
+								}

+								break;

+							case BLIP_OBJECT:

+								blipEntity = CPools::GetObjectPool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);

+								break;

+							default:

+								break;

+						}

+						if (blipEntity) {

+							uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);

+							if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {

+								if (CTheScripts::IsDebugOn()) {

+									ShowRadarMarker(blipEntity->GetPosition(), color, ms_RadarTrace[blipId].m_Radius);

+									ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f;

+									if (ms_RadarTrace[blipId].m_Radius < 1.0f)

+										ms_RadarTrace[blipId].m_Radius = 5.0f;

+								}

+							}

+							if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BLIP_ONLY) {

+								TransformRealWorldPointToRadarSpace(in, blipEntity->GetPosition());

+								float dist = LimitRadarPoint(in);

+								TransformRadarPointToScreenSpace(out, in);

+								if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_NONE) {

+									DrawRadarSprite(ms_RadarTrace[blipId].m_IconID, out.x, out.y, CalculateBlipAlpha(dist));

+								} else {

+#ifdef TRIANGULAR_BLIPS

+									CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();

+									CVector &blipPos = blipEntity->GetPosition();

+									uint8 mode = BLIP_MODE_TRIANGULAR_UP;

 									if (blipPos.z - pos.z <= 2.0f) {

 										if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;

 										else mode = BLIP_MODE_SQUARE;

-									}
-									ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
-#else
-									ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
-#endif
-								}
-							}
-						}
-					}
-					break;
-				case BLIP_COORD:
-				case BLIP_CONTACT_POINT:
-					if ((ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_BOMB || ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_SAVE
-						|| ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_SPRAY || ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_WEAPON)
-						&& (ms_RadarTrace[blipId].m_eBlipType != BLIP_CONTACT_POINT || !CTheScripts::IsPlayerOnAMission())) {
-
-						uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);
-						if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
-							if (CTheScripts::IsDebugOn()) {
-								ShowRadarMarker(ms_RadarTrace[blipId].m_vecPos, color, ms_RadarTrace[blipId].m_Radius);
-								ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f;
-								if (ms_RadarTrace[blipId].m_Radius < 1.0f)
-									ms_RadarTrace[blipId].m_Radius = 5.0f;
-							}
-						}
-						if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BLIP_ONLY) {
-							TransformRealWorldPointToRadarSpace(in, ms_RadarTrace[blipId].m_vec2DPos);
-							float dist = LimitRadarPoint(in);
-							TransformRadarPointToScreenSpace(out, in);
-							if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_NONE) {
-								DrawRadarSprite(ms_RadarTrace[blipId].m_IconID, out.x, out.y, CalculateBlipAlpha(dist));
-							} else {
-#ifdef TRIANGULAR_BLIPS
-								CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();
-								CVector &blipPos = ms_RadarTrace[blipId].m_vecPos;
-								uint8 mode = BLIP_MODE_TRIANGULAR_UP;
+									}

+									ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);

+#else

+									ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);

+#endif

+								}

+							}

+						}

+					}

+					break;

+				case BLIP_COORD:

+				case BLIP_CONTACT_POINT:

+					if ((ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_BOMB || ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_SAVE

+						|| ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_SPRAY || ms_RadarTrace[blipId].m_IconID == RADAR_SPRITE_WEAPON)

+						&& (ms_RadarTrace[blipId].m_eBlipType != BLIP_CONTACT_POINT || !CTheScripts::IsPlayerOnAMission())) {

+

+						uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);

+						if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {

+							if (CTheScripts::IsDebugOn()) {

+								ShowRadarMarker(ms_RadarTrace[blipId].m_vecPos, color, ms_RadarTrace[blipId].m_Radius);

+								ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f;

+								if (ms_RadarTrace[blipId].m_Radius < 1.0f)

+									ms_RadarTrace[blipId].m_Radius = 5.0f;

+							}

+						}

+						if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BLIP_ONLY) {

+							TransformRealWorldPointToRadarSpace(in, ms_RadarTrace[blipId].m_vec2DPos);

+							float dist = LimitRadarPoint(in);

+							TransformRadarPointToScreenSpace(out, in);

+							if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_NONE) {

+								DrawRadarSprite(ms_RadarTrace[blipId].m_IconID, out.x, out.y, CalculateBlipAlpha(dist));

+							} else {

+#ifdef TRIANGULAR_BLIPS

+								CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();

+								CVector &blipPos = ms_RadarTrace[blipId].m_vecPos;

+								uint8 mode = BLIP_MODE_TRIANGULAR_UP;

 								if (blipPos.z - pos.z <= 2.0f) {

 									if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;

 									else mode = BLIP_MODE_SQUARE;

-								}
-								ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
-#else
-								ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
-#endif
-							}
-						}
-					}
-					break;
-				default:
-					break;
-			}
-		}
-		for(int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {
-			if (!ms_RadarTrace[blipId].m_bInUse)
-				continue;
-
-			switch (ms_RadarTrace[blipId].m_eBlipType) {
-				case BLIP_CAR:
-				case BLIP_CHAR:
-				case BLIP_OBJECT:
-					if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_BOMB && ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_SAVE
-						&& ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_WEAPON) {
-
-						switch (ms_RadarTrace[blipId].m_eBlipType) {
-							case BLIP_CAR:
-								blipEntity = CPools::GetVehiclePool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);
-								break;
-							case BLIP_CHAR:
+								}

+								ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);

+#else

+								ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);

+#endif

+							}

+						}

+					}

+					break;

+				default:

+					break;

+			}

+		}

+		for(int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {

+			if (!ms_RadarTrace[blipId].m_bInUse)

+				continue;

+

+			switch (ms_RadarTrace[blipId].m_eBlipType) {

+				case BLIP_CAR:

+				case BLIP_CHAR:

+				case BLIP_OBJECT:

+					if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_BOMB && ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_SAVE

+						&& ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_WEAPON) {

+

+						switch (ms_RadarTrace[blipId].m_eBlipType) {

+							case BLIP_CAR:

+								blipEntity = CPools::GetVehiclePool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);

+								break;

+							case BLIP_CHAR:

 								blipEntity = CPools::GetPedPool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);

 								if (blipEntity != nil) {

 									if (((CPed*)blipEntity)->InVehicle())

 										blipEntity = ((CPed*)blipEntity)->m_pMyVehicle;

-								}
-								break;
-							case BLIP_OBJECT:
-								blipEntity = CPools::GetObjectPool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);
-								break;
-							default:
-								break;
-						}
-
-						if (blipEntity) {
-							uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);
-							if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
-								if (CTheScripts::IsDebugOn()) {
-									ShowRadarMarker(blipEntity->GetPosition(), color, ms_RadarTrace[blipId].m_Radius);
-									ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f;
-									if (ms_RadarTrace[blipId].m_Radius < 1.0f)
-										ms_RadarTrace[blipId].m_Radius = 5.0f;
-								}
-							}
-							if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BLIP_ONLY) {
-								TransformRealWorldPointToRadarSpace(in, blipEntity->GetPosition());
-								float dist = LimitRadarPoint(in);
-								TransformRadarPointToScreenSpace(out, in);
-								if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_NONE)
-									DrawRadarSprite(ms_RadarTrace[blipId].m_IconID, out.x, out.y, CalculateBlipAlpha(dist));
-								else
-#ifdef TRIANGULAR_BLIPS
-								{
-									CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();
-									CVector &blipPos = blipEntity->GetPosition();
-									uint8 mode = BLIP_MODE_TRIANGULAR_UP;
+								}

+								break;

+							case BLIP_OBJECT:

+								blipEntity = CPools::GetObjectPool()->GetAt(ms_RadarTrace[blipId].m_nEntityHandle);

+								break;

+							default:

+								break;

+						}

+

+						if (blipEntity) {

+							uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);

+							if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {

+								if (CTheScripts::IsDebugOn()) {

+									ShowRadarMarker(blipEntity->GetPosition(), color, ms_RadarTrace[blipId].m_Radius);

+									ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f;

+									if (ms_RadarTrace[blipId].m_Radius < 1.0f)

+										ms_RadarTrace[blipId].m_Radius = 5.0f;

+								}

+							}

+							if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BLIP_ONLY) {

+								TransformRealWorldPointToRadarSpace(in, blipEntity->GetPosition());

+								float dist = LimitRadarPoint(in);

+								TransformRadarPointToScreenSpace(out, in);

+								if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_NONE)

+									DrawRadarSprite(ms_RadarTrace[blipId].m_IconID, out.x, out.y, CalculateBlipAlpha(dist));

+								else

+#ifdef TRIANGULAR_BLIPS

+								{

+									CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();

+									CVector &blipPos = blipEntity->GetPosition();

+									uint8 mode = BLIP_MODE_TRIANGULAR_UP;

 									if (blipPos.z - pos.z <= 2.0f) {

 										if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;

 										else mode = BLIP_MODE_SQUARE;

-									}
-									ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
-								}
-#else
-									ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
-#endif
-							}
-						}
-					}
-					break;
-				default:
-					break;
-			}
-		}
-		for (int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {
-			if (!ms_RadarTrace[blipId].m_bInUse)
-				continue;
-
-			switch (ms_RadarTrace[blipId].m_eBlipType) {
-				case BLIP_COORD:
-				case BLIP_CONTACT_POINT:
-					if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_BOMB && ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_SAVE
-						&& ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_WEAPON
-						&& (ms_RadarTrace[blipId].m_eBlipType != BLIP_CONTACT_POINT || !CTheScripts::IsPlayerOnAMission())) {
-
-						uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);
-						if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
-							if (CTheScripts::IsDebugOn()) {
-								ShowRadarMarker(ms_RadarTrace[blipId].m_vecPos, color, ms_RadarTrace[blipId].m_Radius);
-								ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f;
-								if (ms_RadarTrace[blipId].m_Radius < 1.0f)
-									ms_RadarTrace[blipId].m_Radius = 5.0f;
-							}
-						}
-						if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BLIP_ONLY) {
-							TransformRealWorldPointToRadarSpace(in, ms_RadarTrace[blipId].m_vec2DPos);
-							float dist = LimitRadarPoint(in);
-							TransformRadarPointToScreenSpace(out, in);
-							if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_NONE)
-								DrawRadarSprite(ms_RadarTrace[blipId].m_IconID, out.x, out.y, CalculateBlipAlpha(dist));
-							else
-#ifdef TRIANGULAR_BLIPS
-							{
-								CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();
-								CVector &blipPos = ms_RadarTrace[blipId].m_vecPos;
-								uint8 mode = BLIP_MODE_TRIANGULAR_UP;
+									}

+									ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);

+								}

+#else

+									ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);

+#endif

+							}

+						}

+					}

+					break;

+				default:

+					break;

+			}

+		}

+		for (int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {

+			if (!ms_RadarTrace[blipId].m_bInUse)

+				continue;

+

+			switch (ms_RadarTrace[blipId].m_eBlipType) {

+				case BLIP_COORD:

+				case BLIP_CONTACT_POINT:

+					if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_BOMB && ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_SAVE

+						&& ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_WEAPON

+						&& (ms_RadarTrace[blipId].m_eBlipType != BLIP_CONTACT_POINT || !CTheScripts::IsPlayerOnAMission())) {

+

+						uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);

+						if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {

+							if (CTheScripts::IsDebugOn()) {

+								ShowRadarMarker(ms_RadarTrace[blipId].m_vecPos, color, ms_RadarTrace[blipId].m_Radius);

+								ms_RadarTrace[blipId].m_Radius = ms_RadarTrace[blipId].m_Radius - 0.1f;

+								if (ms_RadarTrace[blipId].m_Radius < 1.0f)

+									ms_RadarTrace[blipId].m_Radius = 5.0f;

+							}

+						}

+						if (ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[blipId].m_eBlipDisplay == BLIP_DISPLAY_BLIP_ONLY) {

+							TransformRealWorldPointToRadarSpace(in, ms_RadarTrace[blipId].m_vec2DPos);

+							float dist = LimitRadarPoint(in);

+							TransformRadarPointToScreenSpace(out, in);

+							if (ms_RadarTrace[blipId].m_IconID != RADAR_SPRITE_NONE)

+								DrawRadarSprite(ms_RadarTrace[blipId].m_IconID, out.x, out.y, CalculateBlipAlpha(dist));

+							else

+#ifdef TRIANGULAR_BLIPS

+							{

+								CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();

+								CVector &blipPos = ms_RadarTrace[blipId].m_vecPos;

+								uint8 mode = BLIP_MODE_TRIANGULAR_UP;

 								if (blipPos.z - pos.z <= 2.0f) {

 									if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;

 									else mode = BLIP_MODE_SQUARE;

-								}
-								ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
-							}
-#else
-								ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
-#endif
-						}
-					}
-					break;
-				default:
-					break;
-			}
-		}
-	}
-}
-#endif
-
-
-#if 0
-WRAPPER void CRadar::DrawMap () { EAXJMP(0x4A4200); }
-#else
-void CRadar::DrawMap()
-{
-	if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {
-		if (FindPlayerVehicle()) {
-			float speed = FindPlayerSpeed().Magnitude();
-			if (speed < RADAR_MIN_SPEED)
-				m_radarRange = RADAR_MIN_RANGE;
-			else if (speed < RADAR_MAX_SPEED)
-				m_radarRange = (speed - RADAR_MIN_SPEED)/(RADAR_MAX_SPEED-RADAR_MIN_SPEED) * (RADAR_MAX_RANGE-RADAR_MIN_RANGE) + RADAR_MIN_RANGE;
-			else
-				m_radarRange = RADAR_MAX_RANGE;
-		}
-		else
-			m_radarRange = RADAR_MIN_RANGE;
-
-		vec2DRadarOrigin = CVector2D(FindPlayerCentreOfWorld_NoSniperShift());
-		DrawRadarMap();
-	}
-}
-#endif 
-
-#if 0
-WRAPPER void CRadar::DrawRadarMap() { EAXJMP(0x4A6C20); }
-#else
-void CRadar::DrawRadarMap()
-{
-	// Game calculates an unused CRect here
-
-	DrawRadarMask();
-
-	// top left ist (0, 0)
-	int x = floorf((vec2DRadarOrigin.x - WORLD_MIN_X) / RADAR_TILE_SIZE);
-	int y = ceilf((RADAR_NUM_TILES - 1) - (vec2DRadarOrigin.y - WORLD_MIN_Y) / RADAR_TILE_SIZE);
-	StreamRadarSections(x, y);
-
-	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
-	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
-	RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEFLAT);
-	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
-	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	RwRenderStateSet(rwRENDERSTATETEXTUREPERSPECTIVE, (void*)FALSE);
-
-	DrawRadarSection(x - 1, y - 1);
-	DrawRadarSection(x, y - 1);
-	DrawRadarSection(x + 1, y - 1);
-	DrawRadarSection(x - 1, y);
-	DrawRadarSection(x, y);
-	DrawRadarSection(x + 1, y);
-	DrawRadarSection(x - 1, y + 1);
-	DrawRadarSection(x, y + 1);
-	DrawRadarSection(x + 1, y + 1);
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::DrawRadarMask() { EAXJMP(0x4A69C0); }
-#else
-void CRadar::DrawRadarMask() 
-{ 
-	CVector2D corners[4] = {
-		CVector2D(1.0f, -1.0f),
-		CVector2D(1.0f, 1.0f),
-		CVector2D(-1.0f, 1.0f),
-		CVector2D(-1.0, -1.0f)
-	};
-
-	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
-	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
-	RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEFLAT);
-	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
-	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
-	RwD3D8SetRenderState(rwRENDERSTATESTENCILFUNCTION, rwSTENCILFUNCTIONALWAYS);
-
-	CVector2D out[8];
-	CVector2D in;
-
-	// Draw the shape we want to mask out from the radar in four segments
-	for (int i = 0; i < 4; i++) {
-		// First point is always the corner itself
-		in.x = corners[i].x;
-		in.y = corners[i].y;
-		TransformRadarPointToScreenSpace(out[0], in);
-
-		// Then generate a quarter of the circle
-		for (int j = 0; j < 7; j++) {
-			in.x = corners[i].x * Cos(j * (PI / 2.0f / 6.0f));
-			in.y = corners[i].y * Sin(j * (PI / 2.0f / 6.0f));
-			TransformRadarPointToScreenSpace(out[j + 1], in);
-		};
-
-		CSprite2d::SetMaskVertices(8, (float *)out);
-		RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::GetVertices(), 8);
-	};
-
-	RwD3D8SetRenderState(rwRENDERSTATESTENCILFUNCTION, rwSTENCILFUNCTIONGREATER);
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::DrawRadarSection(int32, int32) { EAXJMP(0x4A67E0); }
-#else
-void CRadar::DrawRadarSection(int32 x, int32 y)
-{
-	int i;
-	RwTexDictionary *txd;
-	CVector2D worldPoly[8];
-	CVector2D radarCorners[4];
-	CVector2D radarPoly[8];
-	CVector2D texCoords[8];
-	CVector2D screenPoly[8];
-	int numVertices;
-	RwTexture *texture = nil;
-
-	GetTextureCorners(x, y, worldPoly);
-	ClipRadarTileCoords(x, y);
-
-	assert(CTxdStore::GetSlot(gRadarTxdIds[x + RADAR_NUM_TILES * y]));
-	txd = CTxdStore::GetSlot(gRadarTxdIds[x + RADAR_NUM_TILES * y])->texDict;
-	if (txd)
-		texture = GetFirstTexture(txd);
-	if (texture == nil)
-		return;
-
-	for (i = 0; i < 4; i++)
-		TransformRealWorldPointToRadarSpace(radarCorners[i], worldPoly[i]);
-
-	numVertices = ClipRadarPoly(radarPoly, radarCorners);
-
-	// FIX: can return earlier here
-//	if(numVertices == 0)
-	if (numVertices < 3)
-		return;
-
-	for (i = 0; i < numVertices; i++) {
-		TransformRadarPointToRealWorldSpace(worldPoly[i], radarPoly[i]);
-		TransformRealWorldToTexCoordSpace(texCoords[i], worldPoly[i], x, y);
-		TransformRadarPointToScreenSpace(screenPoly[i], radarPoly[i]);
-	}
-	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(texture));
-	CSprite2d::SetVertices(numVertices, (float*)screenPoly, (float*)texCoords, CRGBA(255, 255, 255, 255));
-	// check done above now
-//	if(numVertices > 2)
-	RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::GetVertices(), numVertices);
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha) { EAXJMP(0x4A5EF0); }
-#else
-void CRadar::DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha)
-{
-	RadarSprites[sprite]->Draw(CRect(x - SCREEN_SCALE_X(8.0f), y - SCREEN_SCALE_Y(8.0f), x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(8.0f)), CRGBA(255, 255, 255, alpha));
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float angle, int32 alpha) { EAXJMP(0x4A5D10); }
-#else
-void CRadar::DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float angle, int32 alpha)
-{
-	CVector curPosn[4];
-	CVector oldPosn[4];
-
-	curPosn[0].x = x - SCREEN_SCALE_X(5.6f);
-	curPosn[0].y = y + SCREEN_SCALE_Y(5.6f);
-
-	curPosn[1].x = x + SCREEN_SCALE_X(5.6f);
-	curPosn[1].y = y + SCREEN_SCALE_Y(5.6f);
-
-	curPosn[2].x = x - SCREEN_SCALE_X(5.6f);
-	curPosn[2].y = y - SCREEN_SCALE_Y(5.6f);
-
-	curPosn[3].x = x + SCREEN_SCALE_X(5.6f);
-	curPosn[3].y = y - SCREEN_SCALE_Y(5.6f);
-
-	for (uint32 i = 0; i < 4; i++) {
-		oldPosn[i] = curPosn[i];
-
-		curPosn[i].x = x + (oldPosn[i].x - x) * Cos(angle) + (oldPosn[i].y - y) * Sin(angle);
-		curPosn[i].y = y - (oldPosn[i].x - x) * Sin(angle) + (oldPosn[i].y - y) * Cos(angle);
-	}
-
-	sprite->Draw(curPosn[2].x, curPosn[2].y, curPosn[3].x, curPosn[3].y, curPosn[0].x, curPosn[0].y, curPosn[1].x, curPosn[1].y, CRGBA(255, 255, 255, alpha));
-}
-#endif 
-
-#if 0
-WRAPPER int32 CRadar::GetActualBlipArrayIndex(int32) { EAXJMP(0x4A41C0); }
-#else
-int32 CRadar::GetActualBlipArrayIndex(int32 i)
-{
-	if (i == -1)
-		return -1;
-	else if ((i & 0xFFFF0000) >> 16 != ms_RadarTrace[(uint16)i].m_BlipIndex)
-		return -1;
-	else
-		return (uint16)i;
-}
-#endif
-
-#if 0
-WRAPPER int32 CRadar::GetNewUniqueBlipIndex(int32) { EAXJMP(0x4A4180); }
-#else
-int32 CRadar::GetNewUniqueBlipIndex(int32 i)
+								}

+								ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);

+							}

+#else

+								ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);

+#endif

+						}

+					}

+					break;

+				default:

+					break;

+			}

+		}

+	}

+}

+#endif

+

+

+#if 0

+WRAPPER void CRadar::DrawMap () { EAXJMP(0x4A4200); }

+#else

+void CRadar::DrawMap()

+{

+	if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {

+		if (FindPlayerVehicle()) {

+			float speed = FindPlayerSpeed().Magnitude();

+			if (speed < RADAR_MIN_SPEED)

+				m_radarRange = RADAR_MIN_RANGE;

+			else if (speed < RADAR_MAX_SPEED)

+				m_radarRange = (speed - RADAR_MIN_SPEED)/(RADAR_MAX_SPEED-RADAR_MIN_SPEED) * (RADAR_MAX_RANGE-RADAR_MIN_RANGE) + RADAR_MIN_RANGE;

+			else

+				m_radarRange = RADAR_MAX_RANGE;

+		}

+		else

+			m_radarRange = RADAR_MIN_RANGE;

+

+		vec2DRadarOrigin = CVector2D(FindPlayerCentreOfWorld_NoSniperShift());

+		DrawRadarMap();

+	}

+}

+#endif 

+

+#if 0

+WRAPPER void CRadar::DrawRadarMap() { EAXJMP(0x4A6C20); }

+#else

+void CRadar::DrawRadarMap()

+{

+	// Game calculates an unused CRect here

+

+	DrawRadarMask();

+

+	// top left ist (0, 0)

+	int x = floorf((vec2DRadarOrigin.x - WORLD_MIN_X) / RADAR_TILE_SIZE);

+	int y = ceilf((RADAR_NUM_TILES - 1) - (vec2DRadarOrigin.y - WORLD_MIN_Y) / RADAR_TILE_SIZE);

+	StreamRadarSections(x, y);

+

+	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);

+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);

+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);

+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);

+	RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEFLAT);

+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);

+	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);

+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);

+	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);

+	RwRenderStateSet(rwRENDERSTATETEXTUREPERSPECTIVE, (void*)FALSE);

+

+	DrawRadarSection(x - 1, y - 1);

+	DrawRadarSection(x, y - 1);

+	DrawRadarSection(x + 1, y - 1);

+	DrawRadarSection(x - 1, y);

+	DrawRadarSection(x, y);

+	DrawRadarSection(x + 1, y);

+	DrawRadarSection(x - 1, y + 1);

+	DrawRadarSection(x, y + 1);

+	DrawRadarSection(x + 1, y + 1);

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::DrawRadarMask() { EAXJMP(0x4A69C0); }

+#else

+void CRadar::DrawRadarMask() 

+{ 

+	CVector2D corners[4] = {

+		CVector2D(1.0f, -1.0f),

+		CVector2D(1.0f, 1.0f),

+		CVector2D(-1.0f, 1.0f),

+		CVector2D(-1.0, -1.0f)

+	};

+

+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void*)FALSE);

+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);

+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);

+	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);

+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);

+	RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEFLAT);

+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);

+	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);

+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);

+	RwD3D8SetRenderState(rwRENDERSTATESTENCILFUNCTION, rwSTENCILFUNCTIONALWAYS);

+

+	CVector2D out[8];

+	CVector2D in;

+

+	// Draw the shape we want to mask out from the radar in four segments

+	for (int i = 0; i < 4; i++) {

+		// First point is always the corner itself

+		in.x = corners[i].x;

+		in.y = corners[i].y;

+		TransformRadarPointToScreenSpace(out[0], in);

+

+		// Then generate a quarter of the circle

+		for (int j = 0; j < 7; j++) {

+			in.x = corners[i].x * Cos(j * (PI / 2.0f / 6.0f));

+			in.y = corners[i].y * Sin(j * (PI / 2.0f / 6.0f));

+			TransformRadarPointToScreenSpace(out[j + 1], in);

+		};

+

+		CSprite2d::SetMaskVertices(8, (float *)out);

+		RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::GetVertices(), 8);

+	};

+

+	RwD3D8SetRenderState(rwRENDERSTATESTENCILFUNCTION, rwSTENCILFUNCTIONGREATER);

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::DrawRadarSection(int32, int32) { EAXJMP(0x4A67E0); }

+#else

+void CRadar::DrawRadarSection(int32 x, int32 y)

+{

+	int i;

+	RwTexDictionary *txd;

+	CVector2D worldPoly[8];

+	CVector2D radarCorners[4];

+	CVector2D radarPoly[8];

+	CVector2D texCoords[8];

+	CVector2D screenPoly[8];

+	int numVertices;

+	RwTexture *texture = nil;

+

+	GetTextureCorners(x, y, worldPoly);

+	ClipRadarTileCoords(x, y);

+

+	assert(CTxdStore::GetSlot(gRadarTxdIds[x + RADAR_NUM_TILES * y]));

+	txd = CTxdStore::GetSlot(gRadarTxdIds[x + RADAR_NUM_TILES * y])->texDict;

+	if (txd)

+		texture = GetFirstTexture(txd);

+	if (texture == nil)

+		return;

+

+	for (i = 0; i < 4; i++)

+		TransformRealWorldPointToRadarSpace(radarCorners[i], worldPoly[i]);

+

+	numVertices = ClipRadarPoly(radarPoly, radarCorners);

+

+	// FIX: can return earlier here

+//	if(numVertices == 0)

+	if (numVertices < 3)

+		return;

+

+	for (i = 0; i < numVertices; i++) {

+		TransformRadarPointToRealWorldSpace(worldPoly[i], radarPoly[i]);

+		TransformRealWorldToTexCoordSpace(texCoords[i], worldPoly[i], x, y);

+		TransformRadarPointToScreenSpace(screenPoly[i], radarPoly[i]);

+	}

+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(texture));

+	CSprite2d::SetVertices(numVertices, (float*)screenPoly, (float*)texCoords, CRGBA(255, 255, 255, 255));

+	// check done above now

+//	if(numVertices > 2)

+	RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::GetVertices(), numVertices);

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha) { EAXJMP(0x4A5EF0); }

+#else

+void CRadar::DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha)

+{

+	RadarSprites[sprite]->Draw(CRect(x - SCREEN_SCALE_X(8.0f), y - SCREEN_SCALE_Y(8.0f), x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(8.0f)), CRGBA(255, 255, 255, alpha));

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float angle, int32 alpha) { EAXJMP(0x4A5D10); }

+#else

+void CRadar::DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float angle, int32 alpha)

+{

+	CVector curPosn[4];

+	CVector oldPosn[4];

+

+	curPosn[0].x = x - SCREEN_SCALE_X(5.6f);

+	curPosn[0].y = y + SCREEN_SCALE_Y(5.6f);

+

+	curPosn[1].x = x + SCREEN_SCALE_X(5.6f);

+	curPosn[1].y = y + SCREEN_SCALE_Y(5.6f);

+

+	curPosn[2].x = x - SCREEN_SCALE_X(5.6f);

+	curPosn[2].y = y - SCREEN_SCALE_Y(5.6f);

+

+	curPosn[3].x = x + SCREEN_SCALE_X(5.6f);

+	curPosn[3].y = y - SCREEN_SCALE_Y(5.6f);

+

+	for (uint32 i = 0; i < 4; i++) {

+		oldPosn[i] = curPosn[i];

+

+		curPosn[i].x = x + (oldPosn[i].x - x) * Cos(angle) + (oldPosn[i].y - y) * Sin(angle);

+		curPosn[i].y = y - (oldPosn[i].x - x) * Sin(angle) + (oldPosn[i].y - y) * Cos(angle);

+	}

+

+	sprite->Draw(curPosn[2].x, curPosn[2].y, curPosn[3].x, curPosn[3].y, curPosn[0].x, curPosn[0].y, curPosn[1].x, curPosn[1].y, CRGBA(255, 255, 255, alpha));

+}

+#endif 

+

+#if 0

+WRAPPER int32 CRadar::GetActualBlipArrayIndex(int32) { EAXJMP(0x4A41C0); }

+#else

+int32 CRadar::GetActualBlipArrayIndex(int32 i)

+{

+	if (i == -1)

+		return -1;

+	else if ((i & 0xFFFF0000) >> 16 != ms_RadarTrace[(uint16)i].m_BlipIndex)

+		return -1;

+	else

+		return (uint16)i;

+}

+#endif

+

+#if 0

+WRAPPER int32 CRadar::GetNewUniqueBlipIndex(int32) { EAXJMP(0x4A4180); }

+#else

+int32 CRadar::GetNewUniqueBlipIndex(int32 i)

 {

 	if (ms_RadarTrace[i].m_BlipIndex >= UINT16_MAX - 1)

 		ms_RadarTrace[i].m_BlipIndex = 1;

 	else

 		ms_RadarTrace[i].m_BlipIndex++;

-	return i | (ms_RadarTrace[i].m_BlipIndex << 16);
-}
-#endif
-
-#if 0
-WRAPPER uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright) { EAXJMP(0x4A5BB0); }
-#else
-uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright)
-{
-	int32 c;
-	switch (color) {
-	case 0:
-		if (bright)
-			c = 0x712B49FF;
-		else
-			c = 0x7F0000FF;
-		break;
-	case 1:
-		if (bright)
-			c = 0x5FA06AFF;
-		else
-			c = 0x007F00FF;
-		break;
-	case 2:
-		if (bright)
-			c = 0x80A7F3FF;
-		else
-			c = 0x00007FFF;
-		break;
-	case 3:
-		if (bright)
-			c = 0xE1E1E1FF;
-		else
-			c = 0x7F7F7FFF;
-		break;
-	case 4:
-		if (bright)
-			c = 0xFFFF00FF;
-		else
-			c = 0x7F7F00FF;
-		break;
-	case 5:
-		if (bright)
-			c = 0xFF00FFFF;
-		else
-			c = 0x7F007FFF;
-		break;
-	case 6:
-		if (bright)
-			c = 0x00FFFFFF;
-		else
-			c = 0x007F7FFF;
-		break;
-	default:
-		c = color;
-		break;
-	};
-	return c;
-}
-#endif
-
-const char* gRadarTexNames[] = {
+	return i | (ms_RadarTrace[i].m_BlipIndex << 16);

+}

+#endif

+

+#if 0

+WRAPPER uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright) { EAXJMP(0x4A5BB0); }

+#else

+uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright)

+{

+	int32 c;

+	switch (color) {

+	case 0:

+		if (bright)

+			c = 0x712B49FF;

+		else

+			c = 0x7F0000FF;

+		break;

+	case 1:

+		if (bright)

+			c = 0x5FA06AFF;

+		else

+			c = 0x007F00FF;

+		break;

+	case 2:

+		if (bright)

+			c = 0x80A7F3FF;

+		else

+			c = 0x00007FFF;

+		break;

+	case 3:

+		if (bright)

+			c = 0xE1E1E1FF;

+		else

+			c = 0x7F7F7FFF;

+		break;

+	case 4:

+		if (bright)

+			c = 0xFFFF00FF;

+		else

+			c = 0x7F7F00FF;

+		break;

+	case 5:

+		if (bright)

+			c = 0xFF00FFFF;

+		else

+			c = 0x7F007FFF;

+		break;

+	case 6:

+		if (bright)

+			c = 0x00FFFFFF;

+		else

+			c = 0x007F7FFF;

+		break;

+	default:

+		c = color;

+		break;

+	};

+	return c;

+}

+#endif

+

+const char* gRadarTexNames[] = {

 	"radar00", "radar01", "radar02", "radar03", "radar04", "radar05", "radar06", "radar07",

 	"radar08", "radar09", "radar10", "radar11", "radar12", "radar13", "radar14", "radar15",

 	"radar16", "radar17", "radar18", "radar19", "radar20", "radar21", "radar22", "radar23",

@@ -872,14 +872,14 @@ const char* gRadarTexNames[] = {
 	"radar32", "radar33", "radar34", "radar35", "radar36", "radar37", "radar38", "radar39",

 	"radar40", "radar41", "radar42", "radar43", "radar44", "radar45", "radar46", "radar47",

 	"radar48", "radar49", "radar50", "radar51", "radar52", "radar53", "radar54", "radar55",

-	"radar56", "radar57", "radar58", "radar59", "radar60", "radar61", "radar62", "radar63",
-};
-
-#if 0
-WRAPPER void CRadar::Initialise() { EAXJMP(0x4A3EF0); }
-#else
-void
-CRadar::Initialise()
+	"radar56", "radar57", "radar58", "radar59", "radar60", "radar61", "radar62", "radar63",

+};

+

+#if 0

+WRAPPER void CRadar::Initialise() { EAXJMP(0x4A3EF0); }

+#else

+void

+CRadar::Initialise()

 {

 	for (int i = 0; i < NUMRADARBLIPS; i++) {

 		ms_RadarTrace[i].m_BlipIndex = 1;

@@ -892,49 +892,49 @@ CRadar::Initialise()
 

 	m_radarRange = 350.0f;

 	for (int i = 0; i < 64; i++) 

-		gRadarTxdIds[i] = CTxdStore::FindTxdSlot(gRadarTexNames[i]);
-}
-#endif
-
-#if 0
-WRAPPER float CRadar::LimitRadarPoint(CVector2D &point) { EAXJMP(0x4A4F30); }
-#else
-float CRadar::LimitRadarPoint(CVector2D &point)
-{
-	float dist, invdist;
-
-	dist = point.Magnitude();
-	if (dist > 1.0f) {
-		invdist = 1.0f / dist;
-		point.x *= invdist;
-		point.y *= invdist;
-	}
-	return dist;
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::LoadAllRadarBlips(int32) { EAXJMP(0x4A6F30); }
-#else
-void CRadar::LoadAllRadarBlips(uint8 *buf, uint32 size)
-{
-	Initialise();
+		gRadarTxdIds[i] = CTxdStore::FindTxdSlot(gRadarTexNames[i]);

+}

+#endif

+

+#if 0

+WRAPPER float CRadar::LimitRadarPoint(CVector2D &point) { EAXJMP(0x4A4F30); }

+#else

+float CRadar::LimitRadarPoint(CVector2D &point)

+{

+	float dist, invdist;

+

+	dist = point.Magnitude();

+	if (dist > 1.0f) {

+		invdist = 1.0f / dist;

+		point.x *= invdist;

+		point.y *= invdist;

+	}

+	return dist;

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::LoadAllRadarBlips(int32) { EAXJMP(0x4A6F30); }

+#else

+void CRadar::LoadAllRadarBlips(uint8 *buf, uint32 size)

+{

+	Initialise();

 INITSAVEBUF

-	CheckSaveHeader(buf, 'R', 'D', 'R', '\0', size - SAVE_HEADER_SIZE);
-
+	CheckSaveHeader(buf, 'R', 'D', 'R', '\0', size - SAVE_HEADER_SIZE);

+

 	for (int i = 0; i < NUMRADARBLIPS; i++)

-		ms_RadarTrace[i] = ReadSaveBuf<CBlip>(buf);
-

-VALIDATESAVEBUF(size);
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::LoadTextures() { EAXJMP(0x4A4030); }
-#else
-void
-CRadar::LoadTextures()
-{
+		ms_RadarTrace[i] = ReadSaveBuf<CBlip>(buf);

+

+VALIDATESAVEBUF(size);

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::LoadTextures() { EAXJMP(0x4A4030); }

+#else

+void

+CRadar::LoadTextures()

+{

 	CTxdStore::PushCurrentTxd();

 	CTxdStore::SetCurrentTxd(CTxdStore::FindTxdSlot("hud"));

 	AsukaSprite.SetTexture("radar_asuka");

@@ -957,210 +957,210 @@ CRadar::LoadTextures()
 	SpraySprite.SetTexture("radar_spray");

 	TonySprite.SetTexture("radar_tony");

 	WeaponSprite.SetTexture("radar_weapon");

-	CTxdStore::PopCurrentTxd();
-}
-#endif
-
-#if 0
-WRAPPER void RemoveMapSection(int32, int32) { EAXJMP(0x00); }
-#else
-void RemoveMapSection(int32 x, int32 y)
-{
-	if (x >= 0 && x <= 7 && y >= 0 && y <= 7)
-		CStreaming::RemoveTxd(gRadarTxdIds[x + RADAR_NUM_TILES * y]);
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::RemoveRadarSections() { EAXJMP(0x4A60E0); }
-#else
-void CRadar::RemoveRadarSections()
-{
-	for (int i = 0; i < 8; i++)
+	CTxdStore::PopCurrentTxd();

+}

+#endif

+

+#if 0

+WRAPPER void RemoveMapSection(int32, int32) { EAXJMP(0x00); }

+#else

+void RemoveMapSection(int32 x, int32 y)

+{

+	if (x >= 0 && x <= 7 && y >= 0 && y <= 7)

+		CStreaming::RemoveTxd(gRadarTxdIds[x + RADAR_NUM_TILES * y]);

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::RemoveRadarSections() { EAXJMP(0x4A60E0); }

+#else

+void CRadar::RemoveRadarSections()

+{

+	for (int i = 0; i < 8; i++)

 		for (int j = 0; j < 8; j++)

-			RemoveMapSection(i, j);
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::RequestMapSection(int32, int32) { EAXJMP(0x00); }
-#else
-void CRadar::RequestMapSection(int32 x, int32 y)
-{
-	ClipRadarTileCoords(x, y);
-	CStreaming::RequestTxd(gRadarTxdIds[x + RADAR_NUM_TILES * y], STREAMFLAGS_DONT_REMOVE | STREAMFLAGS_DEPENDENCY);
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::SaveAllRadarBlips(int32) { EAXJMP(0x4A6E30); }
-#else
-void CRadar::SaveAllRadarBlips(uint8 *buf, uint32 *size)
-{
-	*size = SAVE_HEADER_SIZE + sizeof(ms_RadarTrace);
+			RemoveMapSection(i, j);

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::RequestMapSection(int32, int32) { EAXJMP(0x00); }

+#else

+void CRadar::RequestMapSection(int32 x, int32 y)

+{

+	ClipRadarTileCoords(x, y);

+	CStreaming::RequestTxd(gRadarTxdIds[x + RADAR_NUM_TILES * y], STREAMFLAGS_DONT_REMOVE | STREAMFLAGS_DEPENDENCY);

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::SaveAllRadarBlips(uint8 *buf, uint32 *size) { EAXJMP(0x4A6E30); }

+#else

+void CRadar::SaveAllRadarBlips(uint8 *buf, uint32 *size)

+{

+	*size = SAVE_HEADER_SIZE + sizeof(ms_RadarTrace);

 INITSAVEBUF

 	WriteSaveHeader(buf, 'R', 'D', 'R', '\0', *size - SAVE_HEADER_SIZE);

 

 	for (int i = 0; i < NUMRADARBLIPS; i++)

-		WriteSaveBuf(buf, ms_RadarTrace[i]);
-
-VALIDATESAVEBUF(*size);
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::SetBlipSprite(int32, int32) { EAXJMP(0x4A5840); }
-#else
-void CRadar::SetBlipSprite(int32 i, int32 icon)
-{
-	int index = CRadar::GetActualBlipArrayIndex(i);
-	if (index != -1) {
-		ms_RadarTrace[index].m_IconID = icon;
-	}
-}
-#endif
-
-#if 0
-WRAPPER int32 CRadar::SetCoordBlip(eBlipType, CVector, int32, eBlipDisplay display) { EAXJMP(0x4A5590); }
-#else
-int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay display)
-{
-	int nextBlip;
-	for (nextBlip = 0; nextBlip < NUMRADARBLIPS; nextBlip++) {
-		if (!ms_RadarTrace[nextBlip].m_bInUse)
-			break;
-	}
-	ms_RadarTrace[nextBlip].m_eBlipType = type;
-	ms_RadarTrace[nextBlip].m_nColor = color;
-	ms_RadarTrace[nextBlip].m_bDim = 1;
-	ms_RadarTrace[nextBlip].m_bInUse = 1;
-	ms_RadarTrace[nextBlip].m_Radius = 1.0f;
-	ms_RadarTrace[nextBlip].m_vec2DPos = pos;
-	ms_RadarTrace[nextBlip].m_vecPos = pos;
-	ms_RadarTrace[nextBlip].m_nEntityHandle = 0;
-	ms_RadarTrace[nextBlip].m_wScale = 1;
-	ms_RadarTrace[nextBlip].m_eBlipDisplay = display;
-	ms_RadarTrace[nextBlip].m_IconID = RADAR_SPRITE_NONE;
-	return CRadar::GetNewUniqueBlipIndex(nextBlip);
-}
-#endif
-
-#if 0
-WRAPPER int CRadar::SetEntityBlip(eBlipType type, int32, int32, eBlipDisplay) { EAXJMP(0x4A5640); }
-#else
-int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDisplay display)
-{
-	int nextBlip;
-	for (nextBlip = 0; nextBlip < NUMRADARBLIPS; nextBlip++) {
-		if (!ms_RadarTrace[nextBlip].m_bInUse)
-			break;
-	}
-	ms_RadarTrace[nextBlip].m_eBlipType = type;
-	ms_RadarTrace[nextBlip].m_nColor = color;
-	ms_RadarTrace[nextBlip].m_bDim = 1;
-	ms_RadarTrace[nextBlip].m_bInUse = 1;
-	ms_RadarTrace[nextBlip].m_Radius = 1.0f;
-	ms_RadarTrace[nextBlip].m_nEntityHandle = handle;
-	ms_RadarTrace[nextBlip].m_wScale = 1;
-	ms_RadarTrace[nextBlip].m_eBlipDisplay = display;
-	ms_RadarTrace[nextBlip].m_IconID = RADAR_SPRITE_NONE;
-	return GetNewUniqueBlipIndex(nextBlip);
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::SetRadarMarkerState(int32, bool) { EAXJMP(0x4A5C60); }
-#else
-void CRadar::SetRadarMarkerState(int32 counter, bool flag)
-{
-	CEntity *e;
-	switch (ms_RadarTrace[counter].m_eBlipType) {
-	case BLIP_CAR:
-		e = CPools::GetVehiclePool()->GetAt(ms_RadarTrace[counter].m_nEntityHandle);
-		break;
-	case BLIP_CHAR:
-		e = CPools::GetPedPool()->GetAt(ms_RadarTrace[counter].m_nEntityHandle);
-		break;
-	case BLIP_OBJECT:
-		e = CPools::GetObjectPool()->GetAt(ms_RadarTrace[counter].m_nEntityHandle);
-		break;
-	default:
-		return;
-	}
-
-	if (e)
-		e->bHasBlip = flag;
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) { EAXJMP(0x4A59C0); }
-#else
-void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {
-	float f1 = radius * 1.4f;
-	float f2 = radius * 0.5f;
-	CVector p1, p2;
-
-	p1 = pos + TheCamera.GetUp()*f1;
-	p2 = pos + TheCamera.GetUp()*f2;
-	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);
-
-	p1 = pos - TheCamera.GetUp()*f1;
-	p2 = pos - TheCamera.GetUp()*f2;
-	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);
-
-	p1 = pos + TheCamera.GetRight()*f1;
-	p2 = pos + TheCamera.GetRight()*f2;
-	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);
-
-	p1 = pos - TheCamera.GetRight()*f1;
-	p2 = pos - TheCamera.GetRight()*f2;
-	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha) { EAXJMP(0x4A5870); }
-#else
-void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha)
-{
-	if (!CHud::m_Wants_To_Draw_Hud || TheCamera.m_WideScreenOn)
-		return;
-
-	CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size + 1.0f), y - SCREEN_SCALE_Y(size + 1.0f), SCREEN_SCALE_X(size + 1.0f) + x, SCREEN_SCALE_Y(size + 1.0f) + y), CRGBA(0, 0, 0, alpha));
-	CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size), y - SCREEN_SCALE_Y(size), SCREEN_SCALE_X(size) + x, SCREEN_SCALE_Y(size) + y), CRGBA(red, green, blue, alpha));
-}
-#endif
-
-void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha, uint8 mode)
-{
-	if (!CHud::m_Wants_To_Draw_Hud || TheCamera.m_WideScreenOn)
-		return;
-
-	switch (mode)
-	{
-	case BLIP_MODE_TRIANGULAR_UP:
-		// size++; // VC does size + 1 for triangles
-		CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(size + 3.0f), y + SCREEN_SCALE_Y(size + 2.0f), x - (SCREEN_SCALE_X(size + 3.0f)), y + SCREEN_SCALE_Y(size + 2.0f), x, y - (SCREEN_SCALE_Y(size + 3.0f)), x, y - (SCREEN_SCALE_Y(size + 3.0f)), CRGBA(0, 0, 0, alpha));
-		CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(size + 1.0f), y + SCREEN_SCALE_Y(size + 1.0f), x - (SCREEN_SCALE_X(size + 1.0f)), y + SCREEN_SCALE_Y(size + 1.0f), x, y - (SCREEN_SCALE_Y(size + 1.0f)), x, y - (SCREEN_SCALE_Y(size + 1.0f)), CRGBA(red, green, blue, alpha));
-		break;
-	case BLIP_MODE_TRIANGULAR_DOWN:
-		// size++; // VC does size + 1 for triangles
-		CSprite2d::Draw2DPolygon(x, y + SCREEN_SCALE_Y(size + 2.0f), x, y + SCREEN_SCALE_Y(size + 3.0f), x + SCREEN_SCALE_X(size + 3.0f), y - (SCREEN_SCALE_Y(size + 2.0f)), x - (SCREEN_SCALE_X(size + 3.0f)), y - (SCREEN_SCALE_Y(size + 2.0f)), CRGBA(0, 0, 0, alpha));
-		CSprite2d::Draw2DPolygon(x, y + SCREEN_SCALE_Y(size + 1.0f), x, y + SCREEN_SCALE_Y(size + 1.0f), x + SCREEN_SCALE_X(size + 1.0f), y - (SCREEN_SCALE_Y(size + 1.0f)), x - (SCREEN_SCALE_X(size + 1.0f)), y - (SCREEN_SCALE_Y(size + 1.0f)), CRGBA(red, green, blue, alpha));
-		break;
-	case BLIP_MODE_SQUARE:
-		CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size + 1.0f), y - SCREEN_SCALE_Y(size + 1.0f), SCREEN_SCALE_X(size + 1.0f) + x, SCREEN_SCALE_Y(size + 1.0f) + y), CRGBA(0, 0, 0, alpha));
-		CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size), y - SCREEN_SCALE_Y(size), SCREEN_SCALE_X(size) + x, SCREEN_SCALE_Y(size) + y), CRGBA(red, green, blue, alpha));
-		break;
-	}
-}
-
-#if 0
-WRAPPER void CRadar::Shutdown() { EAXJMP(0x4A3F60); }
-#else
-void CRadar::Shutdown()
-{
+		WriteSaveBuf(buf, ms_RadarTrace[i]);

+

+VALIDATESAVEBUF(*size);

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::SetBlipSprite(int32, int32) { EAXJMP(0x4A5840); }

+#else

+void CRadar::SetBlipSprite(int32 i, int32 icon)

+{

+	int index = CRadar::GetActualBlipArrayIndex(i);

+	if (index != -1) {

+		ms_RadarTrace[index].m_IconID = icon;

+	}

+}

+#endif

+

+#if 0

+WRAPPER int32 CRadar::SetCoordBlip(eBlipType, CVector, int32, eBlipDisplay display) { EAXJMP(0x4A5590); }

+#else

+int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay display)

+{

+	int nextBlip;

+	for (nextBlip = 0; nextBlip < NUMRADARBLIPS; nextBlip++) {

+		if (!ms_RadarTrace[nextBlip].m_bInUse)

+			break;

+	}

+	ms_RadarTrace[nextBlip].m_eBlipType = type;

+	ms_RadarTrace[nextBlip].m_nColor = color;

+	ms_RadarTrace[nextBlip].m_bDim = 1;

+	ms_RadarTrace[nextBlip].m_bInUse = 1;

+	ms_RadarTrace[nextBlip].m_Radius = 1.0f;

+	ms_RadarTrace[nextBlip].m_vec2DPos = pos;

+	ms_RadarTrace[nextBlip].m_vecPos = pos;

+	ms_RadarTrace[nextBlip].m_nEntityHandle = 0;

+	ms_RadarTrace[nextBlip].m_wScale = 1;

+	ms_RadarTrace[nextBlip].m_eBlipDisplay = display;

+	ms_RadarTrace[nextBlip].m_IconID = RADAR_SPRITE_NONE;

+	return CRadar::GetNewUniqueBlipIndex(nextBlip);

+}

+#endif

+

+#if 0

+WRAPPER int CRadar::SetEntityBlip(eBlipType type, int32, int32, eBlipDisplay) { EAXJMP(0x4A5640); }

+#else

+int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDisplay display)

+{

+	int nextBlip;

+	for (nextBlip = 0; nextBlip < NUMRADARBLIPS; nextBlip++) {

+		if (!ms_RadarTrace[nextBlip].m_bInUse)

+			break;

+	}

+	ms_RadarTrace[nextBlip].m_eBlipType = type;

+	ms_RadarTrace[nextBlip].m_nColor = color;

+	ms_RadarTrace[nextBlip].m_bDim = 1;

+	ms_RadarTrace[nextBlip].m_bInUse = 1;

+	ms_RadarTrace[nextBlip].m_Radius = 1.0f;

+	ms_RadarTrace[nextBlip].m_nEntityHandle = handle;

+	ms_RadarTrace[nextBlip].m_wScale = 1;

+	ms_RadarTrace[nextBlip].m_eBlipDisplay = display;

+	ms_RadarTrace[nextBlip].m_IconID = RADAR_SPRITE_NONE;

+	return GetNewUniqueBlipIndex(nextBlip);

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::SetRadarMarkerState(int32, bool) { EAXJMP(0x4A5C60); }

+#else

+void CRadar::SetRadarMarkerState(int32 counter, bool flag)

+{

+	CEntity *e;

+	switch (ms_RadarTrace[counter].m_eBlipType) {

+	case BLIP_CAR:

+		e = CPools::GetVehiclePool()->GetAt(ms_RadarTrace[counter].m_nEntityHandle);

+		break;

+	case BLIP_CHAR:

+		e = CPools::GetPedPool()->GetAt(ms_RadarTrace[counter].m_nEntityHandle);

+		break;

+	case BLIP_OBJECT:

+		e = CPools::GetObjectPool()->GetAt(ms_RadarTrace[counter].m_nEntityHandle);

+		break;

+	default:

+		return;

+	}

+

+	if (e)

+		e->bHasBlip = flag;

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) { EAXJMP(0x4A59C0); }

+#else

+void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {

+	float f1 = radius * 1.4f;

+	float f2 = radius * 0.5f;

+	CVector p1, p2;

+

+	p1 = pos + TheCamera.GetUp()*f1;

+	p2 = pos + TheCamera.GetUp()*f2;

+	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);

+

+	p1 = pos - TheCamera.GetUp()*f1;

+	p2 = pos - TheCamera.GetUp()*f2;

+	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);

+

+	p1 = pos + TheCamera.GetRight()*f1;

+	p2 = pos + TheCamera.GetRight()*f2;

+	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);

+

+	p1 = pos - TheCamera.GetRight()*f1;

+	p2 = pos - TheCamera.GetRight()*f2;

+	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha) { EAXJMP(0x4A5870); }

+#else

+void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha)

+{

+	if (!CHud::m_Wants_To_Draw_Hud || TheCamera.m_WideScreenOn)

+		return;

+

+	CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size + 1.0f), y - SCREEN_SCALE_Y(size + 1.0f), SCREEN_SCALE_X(size + 1.0f) + x, SCREEN_SCALE_Y(size + 1.0f) + y), CRGBA(0, 0, 0, alpha));

+	CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size), y - SCREEN_SCALE_Y(size), SCREEN_SCALE_X(size) + x, SCREEN_SCALE_Y(size) + y), CRGBA(red, green, blue, alpha));

+}

+#endif

+

+void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha, uint8 mode)

+{

+	if (!CHud::m_Wants_To_Draw_Hud || TheCamera.m_WideScreenOn)

+		return;

+

+	switch (mode)

+	{

+	case BLIP_MODE_TRIANGULAR_UP:

+		// size++; // VC does size + 1 for triangles

+		CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(size + 3.0f), y + SCREEN_SCALE_Y(size + 2.0f), x - (SCREEN_SCALE_X(size + 3.0f)), y + SCREEN_SCALE_Y(size + 2.0f), x, y - (SCREEN_SCALE_Y(size + 3.0f)), x, y - (SCREEN_SCALE_Y(size + 3.0f)), CRGBA(0, 0, 0, alpha));

+		CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(size + 1.0f), y + SCREEN_SCALE_Y(size + 1.0f), x - (SCREEN_SCALE_X(size + 1.0f)), y + SCREEN_SCALE_Y(size + 1.0f), x, y - (SCREEN_SCALE_Y(size + 1.0f)), x, y - (SCREEN_SCALE_Y(size + 1.0f)), CRGBA(red, green, blue, alpha));

+		break;

+	case BLIP_MODE_TRIANGULAR_DOWN:

+		// size++; // VC does size + 1 for triangles

+		CSprite2d::Draw2DPolygon(x, y + SCREEN_SCALE_Y(size + 2.0f), x, y + SCREEN_SCALE_Y(size + 3.0f), x + SCREEN_SCALE_X(size + 3.0f), y - (SCREEN_SCALE_Y(size + 2.0f)), x - (SCREEN_SCALE_X(size + 3.0f)), y - (SCREEN_SCALE_Y(size + 2.0f)), CRGBA(0, 0, 0, alpha));

+		CSprite2d::Draw2DPolygon(x, y + SCREEN_SCALE_Y(size + 1.0f), x, y + SCREEN_SCALE_Y(size + 1.0f), x + SCREEN_SCALE_X(size + 1.0f), y - (SCREEN_SCALE_Y(size + 1.0f)), x - (SCREEN_SCALE_X(size + 1.0f)), y - (SCREEN_SCALE_Y(size + 1.0f)), CRGBA(red, green, blue, alpha));

+		break;

+	case BLIP_MODE_SQUARE:

+		CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size + 1.0f), y - SCREEN_SCALE_Y(size + 1.0f), SCREEN_SCALE_X(size + 1.0f) + x, SCREEN_SCALE_Y(size + 1.0f) + y), CRGBA(0, 0, 0, alpha));

+		CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size), y - SCREEN_SCALE_Y(size), SCREEN_SCALE_X(size) + x, SCREEN_SCALE_Y(size) + y), CRGBA(red, green, blue, alpha));

+		break;

+	}

+}

+

+#if 0

+WRAPPER void CRadar::Shutdown() { EAXJMP(0x4A3F60); }

+#else

+void CRadar::Shutdown()

+{

 	AsukaSprite.Delete();

 	BombSprite.Delete();

 	CatSprite.Delete();

@@ -1181,298 +1181,298 @@ void CRadar::Shutdown()
 	SpraySprite.Delete();

 	TonySprite.Delete();

 	WeaponSprite.Delete();

-	RemoveRadarSections();
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::StreamRadarSections(const CVector &posn) { EAXJMP(0x4A6B60); }
-#else
-void CRadar::StreamRadarSections(const CVector &posn)
+	RemoveRadarSections();

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::StreamRadarSections(const CVector &posn) { EAXJMP(0x4A6B60); }

+#else

+void CRadar::StreamRadarSections(const CVector &posn)

 {

-	StreamRadarSections(floorf((2000.0f + posn.x) / 500.0f), ceilf(7.0f - (2000.0f + posn.y) / 500.0f));
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::StreamRadarSections(int32 x, int32 y) { EAXJMP(0x4A6100); }
-#else
-void CRadar::StreamRadarSections(int32 x, int32 y)
-{
-	for (int i = 0; i < RADAR_NUM_TILES; ++i) {
-		for (int j = 0; j < RADAR_NUM_TILES; ++j) {
-			if ((i >= x - 1 && i <= x + 1) && (j >= y - 1 && j <= y + 1))
-				RequestMapSection(i, j);
-			else
-				RemoveMapSection(i, j);
-		};
-	};
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &in, int32 x, int32 y) { EAXJMP(0x4A5530); }
-#else
-void CRadar::TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &in, int32 x, int32 y)
-{
-	out.x = in.x - (x * RADAR_TILE_SIZE + WORLD_MIN_X);
-	out.y = -(in.y - ((RADAR_NUM_TILES - y) * RADAR_TILE_SIZE + WORLD_MIN_Y));
-	out.x /= RADAR_TILE_SIZE;
-	out.y /= RADAR_TILE_SIZE;
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D &in) { EAXJMP(0x4A5300); }
-#else
-void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D &in)
-{
-	float s, c;
-
-	s = -Sin(TheCamera.GetForward().Heading());
-	c = Cos(TheCamera.GetForward().Heading());
-
-	if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN || TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED) {
-		s = 0.0f;
-		c = 1.0f;
-	}
-	else if (TheCamera.GetLookDirection() != LOOKING_FORWARD) {
-		CVector forward;
-
-		if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON) {
-			forward = TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetForward();
-			forward.Normalise();	// a bit useless...
-		}
-		else
-			forward = TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetPosition() - TheCamera.Cams[TheCamera.ActiveCam].SourceBeforeLookBehind;
-
-		s = -Sin(forward.Heading());
-		c = Cos(forward.Heading());
-	}
-
-	out.x = s * in.y + c * in.x;
-	out.y = c * in.y - s * in.x;
-
-	out = out * m_radarRange + vec2DRadarOrigin;
-}
-#endif
-
-// Radar space goes from -1.0 to 1.0 in x and y, top right is (1.0, 1.0)
-void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &in)
-{
-	// FIX? scale RADAR_LEFT here somehow
-	out.x = (in.x + 1.0f)*0.5f*SCREEN_SCALE_X(RADAR_WIDTH) + RADAR_LEFT;
-	out.y = (1.0f - in.y)*0.5f*SCREEN_SCALE_Y(RADAR_HEIGHT) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT);
-}
-
-#if 0
-WRAPPER void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D &in) { EAXJMP(0x4A50D0); }
-#else
-void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D &in)
-{
-	float s, c;
-	if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN || TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED) {
-		s = 0.0f;
-		c = 1.0f;
-	}
-	else if (TheCamera.GetLookDirection() == LOOKING_FORWARD) {
-		s = Sin(TheCamera.GetForward().Heading());
-		c = Cos(TheCamera.GetForward().Heading());
-	}
-	else {
-		CVector forward;
-
-		if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON) {
-			forward = TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetForward();
-			forward.Normalise();	// a bit useless...
-		}
-		else
-			forward = TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetPosition() - TheCamera.Cams[TheCamera.ActiveCam].SourceBeforeLookBehind;
-
-		s = Sin(forward.Heading());
-		c = Cos(forward.Heading());
-	}
-
-	float x = (in.x - vec2DRadarOrigin.x) * (1.0f / m_radarRange);
-	float y = (in.y - vec2DRadarOrigin.y) * (1.0f / m_radarRange);
-
-	out.x = s * y + c * x;
-	out.y = c * y - s * x;
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::GetTextureCorners(int32 x, int32 y, CVector2D *out) { EAXJMP(0x4A61C0); };
-#else
-// Transform from section indices to world coordinates
-void CRadar::GetTextureCorners(int32 x, int32 y, CVector2D *out)
-{
-	x =   x - RADAR_NUM_TILES/2;
-	y = -(y - RADAR_NUM_TILES/2);
-
-	// bottom left
-	out[0].x = RADAR_TILE_SIZE * (x);
-	out[0].y = RADAR_TILE_SIZE * (y - 1);
-
-	// bottom right
-	out[1].x = RADAR_TILE_SIZE * (x + 1);
-	out[1].y = RADAR_TILE_SIZE * (y - 1);
-
-	// top right
-	out[2].x = RADAR_TILE_SIZE * (x + 1);
-	out[2].y = RADAR_TILE_SIZE * (y);
-
-	// top left
-	out[3].x = RADAR_TILE_SIZE * (x);
-	out[3].y = RADAR_TILE_SIZE * (y);
-}
-#endif
-
-#if 0
-WRAPPER void CRadar::ClipRadarTileCoords(int32 &, int32 &) { EAXJMP(0x00); };
-#else
-void CRadar::ClipRadarTileCoords(int32 &x, int32 &y)
-{
-	if (x < 0)
-		x = 0;
-	if (x > RADAR_NUM_TILES-1)
-		x = RADAR_NUM_TILES-1;
-	if (y < 0)
-		y = 0;
-	if (y > RADAR_NUM_TILES-1)
-		y = RADAR_NUM_TILES-1;
-}
-#endif
-
-
-#if 0
-WRAPPER bool CRadar::IsPointInsideRadar(const CVector2D &) { EAXJMP(0x4A6160); }
-#else
-bool CRadar::IsPointInsideRadar(const CVector2D &point)
-{
-	if (point.x < -1.0f || point.x > 1.0f) return false;
-	if (point.y < -1.0f || point.y > 1.0f) return false;
-	return true;
-}
-#endif
-
-// clip line p1,p2 against (-1.0, 1.0) in x and y, set out to clipped point closest to p1
-#if 0
-WRAPPER int CRadar::LineRadarBoxCollision(CVector2D &, const CVector2D &, const CVector2D &) { EAXJMP(0x4A6250); }
-#else
-int CRadar::LineRadarBoxCollision(CVector2D &out, const CVector2D &p1, const CVector2D &p2)
-{
-	float d1, d2;
-	float t;
-	float x, y;
-	float shortest = 1.0f;
-	int edge = -1;
-
-	// clip against left edge, x = -1.0
-	d1 = -1.0f - p1.x;
-	d2 = -1.0f - p2.x;
-	if (d1 * d2 < 0.0f) {
-		// they are on opposite sides, get point of intersection
-		t = d1 / (d1 - d2);
-		y = (p2.y - p1.y)*t + p1.y;
-		if (y >= -1.0f && y <= 1.0f && t <= shortest) {
-			out.x = -1.0f;
-			out.y = y;
-			edge = 3;
-			shortest = t;
-		}
-	}
-
-	// clip against right edge, x = 1.0
-	d1 = p1.x - 1.0f;
-	d2 = p2.x - 1.0f;
-	if (d1 * d2 < 0.0f) {
-		// they are on opposite sides, get point of intersection
-		t = d1 / (d1 - d2);
-		y = (p2.y - p1.y)*t + p1.y;
-		if (y >= -1.0f && y <= 1.0f && t <= shortest) {
-			out.x = 1.0f;
-			out.y = y;
-			edge = 1;
-			shortest = t;
-		}
-	}
-
-	// clip against top edge, y = -1.0
-	d1 = -1.0f - p1.y;
-	d2 = -1.0f - p2.y;
-	if (d1 * d2 < 0.0f) {
-		// they are on opposite sides, get point of intersection
-		t = d1 / (d1 - d2);
-		x = (p2.x - p1.x)*t + p1.x;
-		if (x >= -1.0f && x <= 1.0f && t <= shortest) {
-			out.y = -1.0f;
-			out.x = x;
-			edge = 0;
-			shortest = t;
-		}
-	}
-
-	// clip against bottom edge, y = 1.0
-	d1 = p1.y - 1.0f;
-	d2 = p2.y - 1.0f;
-	if (d1 * d2 < 0.0f) {
-		// they are on opposite sides, get point of intersection
-		t = d1 / (d1 - d2);
-		x = (p2.x - p1.x)*t + p1.x;
-		if (x >= -1.0f && x <= 1.0f && t <= shortest) {
-			out.y = 1.0f;
-			out.x = x;
-			edge = 2;
-			shortest = t;
-		}
-	}
-
-	return edge;
-}
-#endif
-
-STARTPATCHES
-	InjectHook(0x4A3EF0, CRadar::Initialise, PATCH_JUMP);
-	InjectHook(0x4A3F60, CRadar::Shutdown, PATCH_JUMP);
-	InjectHook(0x4A4030, CRadar::LoadTextures, PATCH_JUMP);
-	InjectHook(0x4A4180, CRadar::GetNewUniqueBlipIndex, PATCH_JUMP);
-	InjectHook(0x4A41C0, CRadar::GetActualBlipArrayIndex, PATCH_JUMP);
-	InjectHook(0x4A4200, CRadar::DrawMap, PATCH_JUMP);
-	InjectHook(0x4A42F0, CRadar::DrawBlips, PATCH_JUMP);
-	InjectHook(0x4A4C70, CRadar::Draw3dMarkers, PATCH_JUMP);
-	InjectHook(0x4A4F30, CRadar::LimitRadarPoint, PATCH_JUMP);
-	InjectHook(0x4A4F90, CRadar::CalculateBlipAlpha, PATCH_JUMP);
-	InjectHook(0x4A5040, CRadar::TransformRadarPointToScreenSpace, PATCH_JUMP);
-	InjectHook(0x4A50D0, CRadar::TransformRealWorldPointToRadarSpace, PATCH_JUMP);
-	InjectHook(0x4A5300, CRadar::TransformRadarPointToRealWorldSpace, PATCH_JUMP);
-	InjectHook(0x4A5530, CRadar::TransformRealWorldToTexCoordSpace, PATCH_JUMP);
-	InjectHook(0x4A5590, CRadar::SetCoordBlip, PATCH_JUMP);
-	InjectHook(0x4A5640, CRadar::SetEntityBlip, PATCH_JUMP);
-	InjectHook(0x4A56C0, CRadar::ClearBlipForEntity, PATCH_JUMP);
-	InjectHook(0x4A5720, CRadar::ClearBlip, PATCH_JUMP);
-	InjectHook(0x4A5770, CRadar::ChangeBlipColour, PATCH_JUMP);
-	InjectHook(0x4A57A0, CRadar::ChangeBlipBrightness, PATCH_JUMP);
-	InjectHook(0x4A57E0, CRadar::ChangeBlipScale, PATCH_JUMP);
-	InjectHook(0x4A5810, CRadar::ChangeBlipDisplay, PATCH_JUMP);
-	InjectHook(0x4A5840, CRadar::SetBlipSprite, PATCH_JUMP);
-	InjectHook(0x4A5870, CRadar::ShowRadarTrace, PATCH_JUMP);
-	InjectHook(0x4A59C0, CRadar::ShowRadarMarker, PATCH_JUMP);
-	InjectHook(0x4A5BB0, CRadar::GetRadarTraceColour, PATCH_JUMP);
-	InjectHook(0x4A5C60, CRadar::SetRadarMarkerState, PATCH_JUMP);
-	InjectHook(0x4A5D10, CRadar::DrawRotatingRadarSprite, PATCH_JUMP);
-	InjectHook(0x4A5EF0, CRadar::DrawRadarSprite, PATCH_JUMP);
-	InjectHook(0x4A60E0, CRadar::RemoveRadarSections, PATCH_JUMP);
-	InjectHook(0x4A6100, (void (*)(int32, int32))&CRadar::StreamRadarSections, PATCH_JUMP);
-	InjectHook(0x4A64A0, CRadar::ClipRadarPoly, PATCH_JUMP);
-	InjectHook(0x4A67E0, CRadar::DrawRadarSection, PATCH_JUMP);
-	InjectHook(0x4A69C0, CRadar::DrawRadarMask, PATCH_JUMP);
-	InjectHook(0x4A6B60, (void (*)(const CVector&))&CRadar::StreamRadarSections, PATCH_JUMP);
-	InjectHook(0x4A6C20, CRadar::DrawRadarMap, PATCH_JUMP);
-	InjectHook(0x4A6E30, CRadar::SaveAllRadarBlips, PATCH_JUMP);
-	InjectHook(0x4A6F30, CRadar::LoadAllRadarBlips, PATCH_JUMP);
-
-	InjectHook(0x4A61C0, CRadar::GetTextureCorners, PATCH_JUMP);
-	InjectHook(0x4A6160, CRadar::IsPointInsideRadar, PATCH_JUMP);
-	InjectHook(0x4A6250, CRadar::LineRadarBoxCollision, PATCH_JUMP);
-ENDPATCHES
+	StreamRadarSections(floorf((2000.0f + posn.x) / 500.0f), ceilf(7.0f - (2000.0f + posn.y) / 500.0f));

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::StreamRadarSections(int32 x, int32 y) { EAXJMP(0x4A6100); }

+#else

+void CRadar::StreamRadarSections(int32 x, int32 y)

+{

+	for (int i = 0; i < RADAR_NUM_TILES; ++i) {

+		for (int j = 0; j < RADAR_NUM_TILES; ++j) {

+			if ((i >= x - 1 && i <= x + 1) && (j >= y - 1 && j <= y + 1))

+				RequestMapSection(i, j);

+			else

+				RemoveMapSection(i, j);

+		};

+	};

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &in, int32 x, int32 y) { EAXJMP(0x4A5530); }

+#else

+void CRadar::TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &in, int32 x, int32 y)

+{

+	out.x = in.x - (x * RADAR_TILE_SIZE + WORLD_MIN_X);

+	out.y = -(in.y - ((RADAR_NUM_TILES - y) * RADAR_TILE_SIZE + WORLD_MIN_Y));

+	out.x /= RADAR_TILE_SIZE;

+	out.y /= RADAR_TILE_SIZE;

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D &in) { EAXJMP(0x4A5300); }

+#else

+void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D &in)

+{

+	float s, c;

+

+	s = -Sin(TheCamera.GetForward().Heading());

+	c = Cos(TheCamera.GetForward().Heading());

+

+	if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN || TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED) {

+		s = 0.0f;

+		c = 1.0f;

+	}

+	else if (TheCamera.GetLookDirection() != LOOKING_FORWARD) {

+		CVector forward;

+

+		if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON) {

+			forward = TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetForward();

+			forward.Normalise();	// a bit useless...

+		}

+		else

+			forward = TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetPosition() - TheCamera.Cams[TheCamera.ActiveCam].SourceBeforeLookBehind;

+

+		s = -Sin(forward.Heading());

+		c = Cos(forward.Heading());

+	}

+

+	out.x = s * in.y + c * in.x;

+	out.y = c * in.y - s * in.x;

+

+	out = out * m_radarRange + vec2DRadarOrigin;

+}

+#endif

+

+// Radar space goes from -1.0 to 1.0 in x and y, top right is (1.0, 1.0)

+void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &in)

+{

+	// FIX? scale RADAR_LEFT here somehow

+	out.x = (in.x + 1.0f)*0.5f*SCREEN_SCALE_X(RADAR_WIDTH) + RADAR_LEFT;

+	out.y = (1.0f - in.y)*0.5f*SCREEN_SCALE_Y(RADAR_HEIGHT) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT);

+}

+

+#if 0

+WRAPPER void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D &in) { EAXJMP(0x4A50D0); }

+#else

+void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D &in)

+{

+	float s, c;

+	if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN || TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED) {

+		s = 0.0f;

+		c = 1.0f;

+	}

+	else if (TheCamera.GetLookDirection() == LOOKING_FORWARD) {

+		s = Sin(TheCamera.GetForward().Heading());

+		c = Cos(TheCamera.GetForward().Heading());

+	}

+	else {

+		CVector forward;

+

+		if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON) {

+			forward = TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetForward();

+			forward.Normalise();	// a bit useless...

+		}

+		else

+			forward = TheCamera.Cams[TheCamera.ActiveCam].CamTargetEntity->GetPosition() - TheCamera.Cams[TheCamera.ActiveCam].SourceBeforeLookBehind;

+

+		s = Sin(forward.Heading());

+		c = Cos(forward.Heading());

+	}

+

+	float x = (in.x - vec2DRadarOrigin.x) * (1.0f / m_radarRange);

+	float y = (in.y - vec2DRadarOrigin.y) * (1.0f / m_radarRange);

+

+	out.x = s * y + c * x;

+	out.y = c * y - s * x;

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::GetTextureCorners(int32 x, int32 y, CVector2D *out) { EAXJMP(0x4A61C0); };

+#else

+// Transform from section indices to world coordinates

+void CRadar::GetTextureCorners(int32 x, int32 y, CVector2D *out)

+{

+	x =   x - RADAR_NUM_TILES/2;

+	y = -(y - RADAR_NUM_TILES/2);

+

+	// bottom left

+	out[0].x = RADAR_TILE_SIZE * (x);

+	out[0].y = RADAR_TILE_SIZE * (y - 1);

+

+	// bottom right

+	out[1].x = RADAR_TILE_SIZE * (x + 1);

+	out[1].y = RADAR_TILE_SIZE * (y - 1);

+

+	// top right

+	out[2].x = RADAR_TILE_SIZE * (x + 1);

+	out[2].y = RADAR_TILE_SIZE * (y);

+

+	// top left

+	out[3].x = RADAR_TILE_SIZE * (x);

+	out[3].y = RADAR_TILE_SIZE * (y);

+}

+#endif

+

+#if 0

+WRAPPER void CRadar::ClipRadarTileCoords(int32 &, int32 &) { EAXJMP(0x00); };

+#else

+void CRadar::ClipRadarTileCoords(int32 &x, int32 &y)

+{

+	if (x < 0)

+		x = 0;

+	if (x > RADAR_NUM_TILES-1)

+		x = RADAR_NUM_TILES-1;

+	if (y < 0)

+		y = 0;

+	if (y > RADAR_NUM_TILES-1)

+		y = RADAR_NUM_TILES-1;

+}

+#endif

+

+

+#if 0

+WRAPPER bool CRadar::IsPointInsideRadar(const CVector2D &) { EAXJMP(0x4A6160); }

+#else

+bool CRadar::IsPointInsideRadar(const CVector2D &point)

+{

+	if (point.x < -1.0f || point.x > 1.0f) return false;

+	if (point.y < -1.0f || point.y > 1.0f) return false;

+	return true;

+}

+#endif

+

+// clip line p1,p2 against (-1.0, 1.0) in x and y, set out to clipped point closest to p1

+#if 0

+WRAPPER int CRadar::LineRadarBoxCollision(CVector2D &, const CVector2D &, const CVector2D &) { EAXJMP(0x4A6250); }

+#else

+int CRadar::LineRadarBoxCollision(CVector2D &out, const CVector2D &p1, const CVector2D &p2)

+{

+	float d1, d2;

+	float t;

+	float x, y;

+	float shortest = 1.0f;

+	int edge = -1;

+

+	// clip against left edge, x = -1.0

+	d1 = -1.0f - p1.x;

+	d2 = -1.0f - p2.x;

+	if (d1 * d2 < 0.0f) {

+		// they are on opposite sides, get point of intersection

+		t = d1 / (d1 - d2);

+		y = (p2.y - p1.y)*t + p1.y;

+		if (y >= -1.0f && y <= 1.0f && t <= shortest) {

+			out.x = -1.0f;

+			out.y = y;

+			edge = 3;

+			shortest = t;

+		}

+	}

+

+	// clip against right edge, x = 1.0

+	d1 = p1.x - 1.0f;

+	d2 = p2.x - 1.0f;

+	if (d1 * d2 < 0.0f) {

+		// they are on opposite sides, get point of intersection

+		t = d1 / (d1 - d2);

+		y = (p2.y - p1.y)*t + p1.y;

+		if (y >= -1.0f && y <= 1.0f && t <= shortest) {

+			out.x = 1.0f;

+			out.y = y;

+			edge = 1;

+			shortest = t;

+		}

+	}

+

+	// clip against top edge, y = -1.0

+	d1 = -1.0f - p1.y;

+	d2 = -1.0f - p2.y;

+	if (d1 * d2 < 0.0f) {

+		// they are on opposite sides, get point of intersection

+		t = d1 / (d1 - d2);

+		x = (p2.x - p1.x)*t + p1.x;

+		if (x >= -1.0f && x <= 1.0f && t <= shortest) {

+			out.y = -1.0f;

+			out.x = x;

+			edge = 0;

+			shortest = t;

+		}

+	}

+

+	// clip against bottom edge, y = 1.0

+	d1 = p1.y - 1.0f;

+	d2 = p2.y - 1.0f;

+	if (d1 * d2 < 0.0f) {

+		// they are on opposite sides, get point of intersection

+		t = d1 / (d1 - d2);

+		x = (p2.x - p1.x)*t + p1.x;

+		if (x >= -1.0f && x <= 1.0f && t <= shortest) {

+			out.y = 1.0f;

+			out.x = x;

+			edge = 2;

+			shortest = t;

+		}

+	}

+

+	return edge;

+}

+#endif

+

+STARTPATCHES

+	InjectHook(0x4A3EF0, CRadar::Initialise, PATCH_JUMP);

+	InjectHook(0x4A3F60, CRadar::Shutdown, PATCH_JUMP);

+	InjectHook(0x4A4030, CRadar::LoadTextures, PATCH_JUMP);

+	InjectHook(0x4A4180, CRadar::GetNewUniqueBlipIndex, PATCH_JUMP);

+	InjectHook(0x4A41C0, CRadar::GetActualBlipArrayIndex, PATCH_JUMP);

+	InjectHook(0x4A4200, CRadar::DrawMap, PATCH_JUMP);

+	InjectHook(0x4A42F0, CRadar::DrawBlips, PATCH_JUMP);

+	InjectHook(0x4A4C70, CRadar::Draw3dMarkers, PATCH_JUMP);

+	InjectHook(0x4A4F30, CRadar::LimitRadarPoint, PATCH_JUMP);

+	InjectHook(0x4A4F90, CRadar::CalculateBlipAlpha, PATCH_JUMP);

+	InjectHook(0x4A5040, CRadar::TransformRadarPointToScreenSpace, PATCH_JUMP);

+	InjectHook(0x4A50D0, CRadar::TransformRealWorldPointToRadarSpace, PATCH_JUMP);

+	InjectHook(0x4A5300, CRadar::TransformRadarPointToRealWorldSpace, PATCH_JUMP);

+	InjectHook(0x4A5530, CRadar::TransformRealWorldToTexCoordSpace, PATCH_JUMP);

+	InjectHook(0x4A5590, CRadar::SetCoordBlip, PATCH_JUMP);

+	InjectHook(0x4A5640, CRadar::SetEntityBlip, PATCH_JUMP);

+	InjectHook(0x4A56C0, CRadar::ClearBlipForEntity, PATCH_JUMP);

+	InjectHook(0x4A5720, CRadar::ClearBlip, PATCH_JUMP);

+	InjectHook(0x4A5770, CRadar::ChangeBlipColour, PATCH_JUMP);

+	InjectHook(0x4A57A0, CRadar::ChangeBlipBrightness, PATCH_JUMP);

+	InjectHook(0x4A57E0, CRadar::ChangeBlipScale, PATCH_JUMP);

+	InjectHook(0x4A5810, CRadar::ChangeBlipDisplay, PATCH_JUMP);

+	InjectHook(0x4A5840, CRadar::SetBlipSprite, PATCH_JUMP);

+	InjectHook(0x4A5870, CRadar::ShowRadarTrace, PATCH_JUMP);

+	InjectHook(0x4A59C0, CRadar::ShowRadarMarker, PATCH_JUMP);

+	InjectHook(0x4A5BB0, CRadar::GetRadarTraceColour, PATCH_JUMP);

+	InjectHook(0x4A5C60, CRadar::SetRadarMarkerState, PATCH_JUMP);

+	InjectHook(0x4A5D10, CRadar::DrawRotatingRadarSprite, PATCH_JUMP);

+	InjectHook(0x4A5EF0, CRadar::DrawRadarSprite, PATCH_JUMP);

+	InjectHook(0x4A60E0, CRadar::RemoveRadarSections, PATCH_JUMP);

+	InjectHook(0x4A6100, (void (*)(int32, int32))&CRadar::StreamRadarSections, PATCH_JUMP);

+	InjectHook(0x4A64A0, CRadar::ClipRadarPoly, PATCH_JUMP);

+	InjectHook(0x4A67E0, CRadar::DrawRadarSection, PATCH_JUMP);

+	InjectHook(0x4A69C0, CRadar::DrawRadarMask, PATCH_JUMP);

+	InjectHook(0x4A6B60, (void (*)(const CVector&))&CRadar::StreamRadarSections, PATCH_JUMP);

+	InjectHook(0x4A6C20, CRadar::DrawRadarMap, PATCH_JUMP);

+	InjectHook(0x4A6E30, CRadar::SaveAllRadarBlips, PATCH_JUMP);

+	InjectHook(0x4A6F30, CRadar::LoadAllRadarBlips, PATCH_JUMP);

+

+	InjectHook(0x4A61C0, CRadar::GetTextureCorners, PATCH_JUMP);

+	InjectHook(0x4A6160, CRadar::IsPointInsideRadar, PATCH_JUMP);

+	InjectHook(0x4A6250, CRadar::LineRadarBoxCollision, PATCH_JUMP);

+ENDPATCHES

diff --git a/src/core/Stats.cpp b/src/core/Stats.cpp
index 2c27ba70..1d088e04 100644
--- a/src/core/Stats.cpp
+++ b/src/core/Stats.cpp
@@ -1,6 +1,9 @@
 #include "common.h"
+#include "patcher.h"
 #include "Stats.h"
 
+WRAPPER void CStats::SaveStats(uint8 *buf, uint32 *size) { EAXJMP(0x4ab3e0); }
+
 int32 &CStats::DaysPassed = *(int32*)0x8F2BB8;
 int32 &CStats::HeadsPopped = *(int32*)0x8F647C;
 bool& CStats::CommercialPassed = *(bool*)0x8F4334;
diff --git a/src/core/Stats.h b/src/core/Stats.h
index 4b558c32..4bf99c45 100644
--- a/src/core/Stats.h
+++ b/src/core/Stats.h
@@ -73,4 +73,5 @@ public:
 	static void CheckPointReachedUnsuccessfully() { KillsSinceLastCheckpoint = 0; };
 	static void CheckPointReachedSuccessfully() { TotalLegitimateKills += KillsSinceLastCheckpoint; KillsSinceLastCheckpoint = 0; };
 	static void RegisterElBurroTime(int32);
-};
\ No newline at end of file
+	static void SaveStats(uint8 *buf, uint32 *size);
+};
diff --git a/src/core/TimeStep.cpp b/src/core/TimeStep.cpp
new file mode 100644
index 00000000..9ccf7200
--- /dev/null
+++ b/src/core/TimeStep.cpp
@@ -0,0 +1,5 @@
+#include "TimeStep.h"
+
+float &CTimeStep::ms_fTimeScale = *(float*)0x5F76C8;
+float &CTimeStep::ms_fFramesPerUpdate = *(float*)0x5F76CC;
+float &CTimeStep::ms_fTimeStep = *(float*)0x5F76D0;
diff --git a/src/core/TimeStep.h b/src/core/TimeStep.h
new file mode 100644
index 00000000..c74df02a
--- /dev/null
+++ b/src/core/TimeStep.h
@@ -0,0 +1,10 @@
+#pragma once
+
+// Pretty sure this class is not used by the game
+class CTimeStep
+{
+public:
+	static float &ms_fTimeScale;
+	static float &ms_fFramesPerUpdate;
+	static float &ms_fTimeStep;
+};
diff --git a/src/core/Timer.h b/src/core/Timer.h
index 8f3b77c2..89c4a430 100644
--- a/src/core/Timer.h
+++ b/src/core/Timer.h
@@ -2,6 +2,7 @@
 
 class CTimer
 {
+public:
 	static uint32 &m_snTimeInMilliseconds;
 	static uint32 &m_snTimeInMillisecondsPauseMode;
 	static uint32 &m_snTimeInMillisecondsNonClipped;
@@ -12,7 +13,7 @@ class CTimer
 	static float &ms_fTimeStepNonClipped;
 	static bool  &m_UserPause;
 	static bool  &m_CodePause;
-public:
+
 	static float GetTimeStep(void) { return ms_fTimeStep; }
 	static void SetTimeStep(float ts) { ms_fTimeStep = ts; }
 	static float GetTimeStepInSeconds() { return ms_fTimeStep / 50.0f; }
diff --git a/src/core/common.h b/src/core/common.h
index cadcac1d..9a5cdb38 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -321,9 +321,9 @@ _TWEEKCLASS(CTweakFloat, float);
 #undef _TWEEKCLASS
 
 #ifdef VALIDATE_SAVE_SIZE
-extern int32 _bufBytesRead;
-#define INITSAVEBUF _bufBytesRead = 0;
-#define VALIDATESAVEBUF(b) assert(_bufBytesRead == b);
+extern int32 _saveBufCount;
+#define INITSAVEBUF _saveBufCount = 0;
+#define VALIDATESAVEBUF(b) assert(_saveBufCount == b);
 #else
 #define INITSAVEBUF
 #define VALIDATESAVEBUF(b)
@@ -333,7 +333,7 @@ inline void SkipSaveBuf(uint8 *&buf, int32 skip)
 {
 	buf += skip;
 #ifdef VALIDATE_SAVE_SIZE
-	_bufBytesRead += skip;
+	_saveBufCount += skip;
 #endif
 }
 
diff --git a/src/core/config.h b/src/core/config.h
index faad34b9..03b8a019 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -168,6 +168,10 @@ enum Config {
 #define USE_MEASUREMENTS_IN_METERS // makes game use meters instead of feet in script
 #define USE_PRECISE_MEASUREMENT_CONVERTION // makes game convert feet to meeters more precisely
 
+// Replay
+//#define DONT_FIX_REPLAY_BUGS // keeps various bugs in CReplay, some of which are fairly cool!
+//#define USE_BETA_REPLAY_MODE // adds another replay mode, a few seconds slomo (caution: buggy!)
+
 // Vehicles
 #define EXPLODING_AIRTRAIN	// can blow up jumbo jet with rocket launcher
 //#define REMOVE_TREADABLE_PATHFIND
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 989a05b5..ed32632f 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -449,7 +449,7 @@ void re3_trace(const char *filename, unsigned int lineno, const char *func, cons
 }
 
 #ifdef VALIDATE_SAVE_SIZE
-int32 _bufBytesRead;
+int32 _saveBufCount;
 #endif
 
 void