12 files changed, 622 insertions, 350 deletions

diff --git a/premake5.lua b/premake5.lua
index 334c9c53..23a9200b 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -332,14 +332,12 @@ project "reVC"
 		links { "rw" }
 
 	filter "platforms:*d3d9*"
+		defines { "USE_D3D9" }
 		links { "d3d9" }
 		
 	filter "platforms:*x86*d3d*"
 		includedirs { "sdk/dx8sdk/include" }
 		libdirs { "sdk/dx8sdk/lib" }
-
-	filter "platforms:*amd64*d3d9*"
-		defines { "USE_D3D9" }
 		
 	filter "platforms:win-x86*gl3_glfw*"
 		libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") }
diff --git a/src/control/Script.h b/src/control/Script.h
index c7218847..c63025b2 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -288,8 +288,8 @@ class CTheScripts
 	static uint16 ScriptsUpdated;
 	static uint32 LastMissionPassedTime;
 	static uint16 NumberOfExclusiveMissionScripts;
-	static bool bPlayerIsInTheStatium;
 public:
+	static bool bPlayerIsInTheStatium;
 	static uint8 RiotIntensity;
 	static bool bPlayerHasMetDebbieHarry;
 public:
@@ -562,4 +562,4 @@ void RetryMission(int, int);
 
 #ifdef USE_DEBUG_SCRIPT_LOADER
 extern int scriptToLoad;
-#endif
\ No newline at end of file
+#endif
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 63684c12..4eda2301 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -4578,19 +4578,13 @@ CMenuManager::UnloadTextures()
 	CUserDisplay::PlaceName.ProcessAfterFrontEndShutDown();
 }
 
+// --MIAMI: Done
 void
 CMenuManager::WaitForUserCD()
 {
 	CSprite2d *splash;
 	char *splashscreen = nil;
 
-#if (!(defined RANDOMSPLASH) && !(defined GTA3_1_1_PATCH))
-	if (CGame::frenchGame || CGame::germanGame || !CGame::nastyGame)
-		splashscreen = "mainsc2";
-	else
-		splashscreen = "mainsc1";
-#endif
-
 	splash = LoadSplash(splashscreen);
 
 	if (RsGlobal.quit)
@@ -4742,6 +4736,53 @@ CMenuManager::PrintMap(void)
 	}
 
 	CRadar::DrawBlips();
+	if (m_PrefsShowLegends) {
+		CFont::SetWrapx(SCREEN_SCALE_FROM_RIGHT(40.0f));
+		CFont::SetRightJustifyWrap(SCREEN_SCALE_X(84.0f));
+		CFont::SetBackGroundOnlyTextOff();
+		CFont::SetColor(CRGBA(255, 150, 225, FadeIn(255)));
+		CFont::SetDropShadowPosition(2);
+		CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255)));
+		CFont::SetCentreOn();
+		CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+		CFont::SetScale(SCREEN_SCALE_X(0.65f), SCREEN_SCALE_Y(0.95f));
+
+		int secondColumnStart = (CRadar::MapLegendCounter - 1) / 2;
+		int boxBottom = MENU_Y(100.0f);
+
+		// + 3, because we want 19*3 px padding
+		for (int i = 0; i < secondColumnStart + 3; i++) {
+			boxBottom += MENU_Y(19.f);
+		}
+
+		CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(95.0f), MENU_Y(100.0f), MENU_X_LEFT_ALIGNED(555.f), boxBottom),
+			CRGBA(0, 0, 0, FadeIn(190)));
+
+		CFont::PrintString(MENU_X_LEFT_ALIGNED(320.0f), MENU_Y(102.0f), TheText.Get("FE_MLG"));
+		CFont::SetRightJustifyOff();
+		CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+		if (m_PrefsLanguage == LANGUAGE_AMERICAN)
+			CFont::SetScale(SCREEN_SCALE_X(0.55f), SCREEN_SCALE_Y(0.55f));
+		else
+			CFont::SetScale(SCREEN_SCALE_X(0.45f), SCREEN_SCALE_Y(0.55f));
+
+		CFont::SetColor(CRGBA(225, 225, 225, FadeIn(255)));
+		CFont::SetDropShadowPosition(0);
+
+		int y = MENU_Y(127.0f);
+		int x = MENU_X_LEFT_ALIGNED(160.0f);
+
+		for (int16 i = 0; i < CRadar::MapLegendCounter; i++) {
+			CRadar::DrawLegend(x, y, CRadar::MapLegendList[i]);
+
+			if (i == secondColumnStart) {
+				x = MENU_X_LEFT_ALIGNED(350.0f);
+				y = MENU_Y(127.0f);
+			} else {
+				y += MENU_Y(19.0f);
+			}
+		}
+	}
 
 #ifdef CUSTOM_MAP
 	CVector2D mapPoint;
@@ -4820,7 +4861,7 @@ CMenuManager::PrintMap(void)
 #endif
 	m_bMenuMapActive = false;
 
-	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(5.0f));
+	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(10.0f));
 	CFont::SetRightJustifyWrap(SCREEN_SCALE_X(10.0f));
 	DisplayHelperText("FEH_MPH");
 }
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 5317040f..78166252 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -15,6 +15,9 @@
 #include "World.h"
 #include "Streaming.h"
 #include "SpecialFX.h"
+#include "Font.h"
+
+// --MIAMI: file done
 
 float CRadar::m_radarRange;
 sRadarTrace CRadar::ms_RadarTrace[NUMRADARBLIPS];
@@ -123,7 +126,7 @@ static_assert(RADAR_TILE_SIZE == (RADAR_SIZE_Y / RADAR_NUM_TILES), "CRadar: not
 
 CRGBA CRadar::ArrowBlipColour1;
 CRGBA CRadar::ArrowBlipColour2;
-uint16 CRadar::MapLegendCounter;
+int16 CRadar::MapLegendCounter;
 int16 CRadar::MapLegendList[NUM_MAP_LEGENDS];
 #ifdef MAP_ENHANCEMENTS
 int CRadar::TargetMarkerId = -1;
@@ -153,7 +156,7 @@ void RequestMapSection(int32 x, int32 y)
 
 void RemoveMapSection(int32 x, int32 y)
 {
-	if (x >= 0 && x <= 7 && y >= 0 && y <= 7)
+	if (x >= 0 && x <= RADAR_NUM_TILES - 1 && y >= 0 && y <= RADAR_NUM_TILES - 1)
 		CStreaming::RemoveTxd(gRadarTxdIds[x + RADAR_NUM_TILES * y]);
 }
 
@@ -260,7 +263,6 @@ int LineRadarBoxCollision(CVector2D &out, const CVector2D &p1, const CVector2D &
 	return edge;
 }
 
-
 uint8 CRadar::CalculateBlipAlpha(float dist)
 {
 	if (FrontEndMenuManager.m_bMenuMapActive)
@@ -269,7 +271,7 @@ uint8 CRadar::CalculateBlipAlpha(float dist)
 	if (dist <= 1.0f)
 		return 255;
 
-	if (dist <= 5.0f)
+	if (dist <= 10.0f)
 		return (128.0f * ((dist - 1.0f) / 4.0f)) + ((1.0f - (dist - 1.0f) / 4.0f) * 255.0f);
 
 	return 128;
@@ -507,7 +509,6 @@ void CRadar::DrawBlips()
 			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;
@@ -516,173 +517,65 @@ void CRadar::DrawBlips()
 				case BLIP_CAR:
 				case BLIP_CHAR:
 				case BLIP_OBJECT:
-					if (ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_SAVE
-						|| ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_SPRAY || ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_GUN) {
+					if (ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_PROPERTY
+						&& (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive))
+						DrawEntityBlip(blipId);
 
-						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_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
-									if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
-										DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
-									}
-									else {
-#ifdef TRIANGULAR_BLIPS
-										const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
-										const 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_eRadarSprite == RADAR_SPRITE_SAVE
-						|| ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_SPRAY || ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_GUN)
-						&& (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_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
-								if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
-									DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
-								}
-								else {
-#ifdef TRIANGULAR_BLIPS
-									const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
-									const 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
-								}
-							}
-						}
-					}
+					if (ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_PHONE
+						&& (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive))
+						DrawCoordBlip(blipId);
+					
 					break;
 				default:
 					break;
 			}
 		}
+
+		// New in VC: Always draw Hardware/gun/pay'n spray/save blips
 		for(int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {
 			if (!ms_RadarTrace[blipId].m_bInUse)
 				continue;
 
+			if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SAVE && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_HARDWARE
+					&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_GUN)
+				continue;
+
 			switch (ms_RadarTrace[blipId].m_eBlipType) {
 				case BLIP_CAR:
 				case BLIP_CHAR:
 				case BLIP_OBJECT:
-					if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SAVE
-						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_GUN) {
+					if (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive)
+						DrawEntityBlip(blipId);
 
-						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;
-						}
+					break;
+				case BLIP_COORD:
+				case BLIP_CONTACT_POINT:
+					if (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive)
+						DrawCoordBlip(blipId);
+					
+					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_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
-									if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE)
-										DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
-									else
-#ifdef TRIANGULAR_BLIPS
-									{
-										const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
-										const 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
-								}
-							}
-						}
-					}
+		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_eRadarSprite != RADAR_SPRITE_SAVE && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_HARDWARE
+						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_PROPERTY
+						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_GUN
+						&& (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive))
+
+						DrawEntityBlip(blipId);
 					break;
 				default:
 					break;
@@ -695,44 +588,12 @@ void CRadar::DrawBlips()
 			switch (ms_RadarTrace[blipId].m_eBlipType) {
 				case BLIP_COORD:
 				case BLIP_CONTACT_POINT:
-					if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SAVE
-						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_GUN
-						&& (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_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
-								if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE)
-									DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
-								else
-#ifdef TRIANGULAR_BLIPS
-								{
-									const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
-									const 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
-							}
-						}
-					}
+					if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SAVE && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_HARDWARE
+						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_PROPERTY
+						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_GUN && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_PHONE
+						&& (!CTheScripts::bPlayerIsInTheStatium || !FrontEndMenuManager.m_bMenuMapActive))
+
+						DrawCoordBlip(blipId);
 					break;
 				default:
 					break;
@@ -740,7 +601,12 @@ void CRadar::DrawBlips()
 		}
 		if (FrontEndMenuManager.m_bMenuMapActive) {
 			CVector2D in, out;
-			TransformRealWorldPointToRadarSpace(in, FindPlayerCentreOfWorld_NoSniperShift());
+			if (!CTheScripts::bPlayerIsInTheStatium)
+				TransformRealWorldPointToRadarSpace(in, FindPlayerCentreOfWorld_NoSniperShift());
+			else
+				TransformRealWorldPointToRadarSpace(in, CVector2D(-1302.5f, 1332.8f));
+
+			LimitRadarPoint(in);
 			TransformRadarPointToScreenSpace(out, in);
 			DrawYouAreHereSprite(out.x, out.y);
 		}
@@ -771,8 +637,6 @@ void CRadar::DrawMap()
 
 void CRadar::DrawRadarMap()
 {
-	// Game calculates an unused CRect here
-
 	DrawRadarMask();
 
 	// top left ist (0, 0)
@@ -812,14 +676,20 @@ void CRadar::DrawRadarMask()
 	};
 
 	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDZERO);
-	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
 	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
 	RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEFLAT);
 	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+#if !defined(GTA_PS2_STUFF) && defined(RWLIBS)
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+	RwD3D8SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_ALWAYS);
+#else
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDZERO);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
+#endif
 
 	CVector2D out[8];
 	CVector2D in;
@@ -840,7 +710,11 @@ void CRadar::DrawRadarMask()
 
 		CSprite2d::SetMaskVertices(8, (float *)out);
 		RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::GetVertices(), 8);
-	};
+	}
+#if !defined(GTA_PS2_STUFF) && defined(RWLIBS)
+	RwD3D8SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATER);
+#endif
+
 }
 
 void CRadar::DrawRadarSection(int32 x, int32 y)
@@ -858,11 +732,8 @@ void CRadar::DrawRadarSection(int32 x, int32 y)
 	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)
+	if (!CTheScripts::bPlayerIsInTheStatium &&
+		(!(txd = CTxdStore::GetSlot(gRadarTxdIds[x + RADAR_NUM_TILES * y])->texDict) || !(texture = GetFirstTexture(txd))))
 		return;
 
 	for (i = 0; i < 4; i++)
@@ -880,8 +751,15 @@ void CRadar::DrawRadarSection(int32 x, int32 y)
 		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));
+
+	if (CTheScripts::bPlayerIsInTheStatium) {
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil);
+		CSprite2d::SetVertices(numVertices, (float*)screenPoly, (float*)texCoords, CRGBA(204, 204, 204, 255));
+	} else {
+		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);
@@ -907,28 +785,17 @@ void CRadar::DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha)
 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);
+	const float sizeX = SCREEN_SCALE_X(8.0f);
+	const float correctedAngle = angle - PI / 4.f;
+	const float sizeY = SCREEN_SCALE_Y(8.0f);
 
 	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);
+		const float cornerAngle = i * HALFPI + correctedAngle;
+		curPosn[i].x = x + (0.0f * Cos(cornerAngle) + 1.0f * Sin(cornerAngle)) * sizeX;
+		curPosn[i].y = y - (0.0f * Sin(cornerAngle) - 1.0f * Cos(cornerAngle)) * sizeY;
 	}
 
-	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));
+	sprite->Draw(curPosn[3].x, curPosn[3].y, curPosn[2].x, curPosn[2].y, curPosn[0].x, curPosn[0].y, curPosn[1].x, curPosn[1].y, CRGBA(255, 255, 255, alpha));
 }
 
 int32 CRadar::GetActualBlipArrayIndex(int32 i)
@@ -954,43 +821,43 @@ uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright)
 {
 	int32 c;
 	switch (color) {
-	case 0:
+	case RADAR_TRACE_RED:
 		if (bright)
 			c = 0x712B49FF;
 		else
 			c = 0x7F0000FF;
 		break;
-	case 1:
+	case RADAR_TRACE_GREEN:
 		if (bright)
 			c = 0x5FA06AFF;
 		else
 			c = 0x007F00FF;
 		break;
-	case 2:
+	case RADAR_TRACE_LIGHT_BLUE:
 		if (bright)
 			c = 0x80A7F3FF;
 		else
 			c = 0x00007FFF;
 		break;
-	case 3:
+	case RADAR_TRACE_GRAY:
 		if (bright)
 			c = 0xE1E1E1FF;
 		else
 			c = 0x7F7F7FFF;
 		break;
-	case 4:
+	case RADAR_TRACE_YELLOW:
 		if (bright)
 			c = 0xFFFF00FF;
 		else
 			c = 0x7F7F00FF;
 		break;
-	case 5:
+	case RADAR_TRACE_MAGENTA:
 		if (bright)
 			c = 0xFF00FFFF;
 		else
 			c = 0x7F007FFF;
 		break;
-	case 6:
+	case RADAR_TRACE_CYAN:
 		if (bright)
 			c = 0x00FFFFFF;
 		else
@@ -1055,12 +922,65 @@ void CRadar::LoadAllRadarBlips(uint8 *buf, uint32 size)
 INITSAVEBUF
 	CheckSaveHeader(buf, 'R', 'D', 'R', '\0', size - SAVE_HEADER_SIZE);
 
-	for (int i = 0; i < NUMRADARBLIPS; i++)
-		ms_RadarTrace[i] = ReadSaveBuf<sRadarTrace>(buf);
+	for (int i = 0; i < NUMRADARBLIPS; i++) {
+		ms_RadarTrace[i].m_nColor = ReadSaveBuf<uint32>(buf);
+		ms_RadarTrace[i].m_eBlipType = ReadSaveBuf<uint32>(buf);
+		ms_RadarTrace[i].m_nEntityHandle = ReadSaveBuf<int32>(buf);
+		ms_RadarTrace[i].m_vec2DPos.x = ReadSaveBuf<float>(buf); // CVector2D
+		ms_RadarTrace[i].m_vec2DPos.y = ReadSaveBuf<float>(buf);
+		ms_RadarTrace[i].m_vecPos = ReadSaveBuf<CVector>(buf);
+		ms_RadarTrace[i].m_BlipIndex = ReadSaveBuf<uint16>(buf);
+		ms_RadarTrace[i].m_bDim = ReadSaveBuf<bool>(buf);
+		ms_RadarTrace[i].m_bInUse = ReadSaveBuf<bool>(buf);
+		ms_RadarTrace[i].m_bShortRange = ReadSaveBuf<bool>(buf);
+		ms_RadarTrace[i].m_unused = ReadSaveBuf<bool>(buf);
+		ms_RadarTrace[i].m_Radius = ReadSaveBuf<float>(buf);
+		ms_RadarTrace[i].m_wScale = ReadSaveBuf<int16>(buf);
+		ms_RadarTrace[i].m_eBlipDisplay = ReadSaveBuf<uint16>(buf);
+		ms_RadarTrace[i].m_eRadarSprite = ReadSaveBuf<uint16>(buf);
+	}
 
 VALIDATESAVEBUF(size);
 }
 
+void CRadar::SaveAllRadarBlips(uint8 *buf, uint32 *size)
+{
+	*size = SAVE_HEADER_SIZE + NUMRADARBLIPS * sizeof(sRadarTraceSave);
+
+INITSAVEBUF
+	WriteSaveHeader(buf, 'R', 'D', 'R', '\0', *size - SAVE_HEADER_SIZE);
+
+#ifdef MAP_ENHANCEMENTS
+	if (TargetMarkerId != -1) {
+		ClearBlip(TargetMarkerId);
+		TargetMarkerId = -1;
+	}
+#endif
+
+	for (int i = 0; i < NUMRADARBLIPS; i++) {
+		sRadarTraceSave *saveStruct = (sRadarTraceSave*) buf;
+
+		saveStruct->m_nColor = ms_RadarTrace[i].m_nColor;
+		saveStruct->m_eBlipType = ms_RadarTrace[i].m_eBlipType;
+		saveStruct->m_nEntityHandle = ms_RadarTrace[i].m_nEntityHandle;
+		saveStruct->m_vec2DPos = ms_RadarTrace[i].m_vec2DPos;
+		saveStruct->m_vecPos = ms_RadarTrace[i].m_vecPos;
+		saveStruct->m_BlipIndex = ms_RadarTrace[i].m_BlipIndex;
+		saveStruct->m_bDim = ms_RadarTrace[i].m_bDim;
+		saveStruct->m_bInUse = ms_RadarTrace[i].m_bInUse;
+		saveStruct->m_bShortRange = ms_RadarTrace[i].m_bShortRange;
+		saveStruct->m_unused = ms_RadarTrace[i].m_unused;
+		saveStruct->m_Radius = ms_RadarTrace[i].m_Radius;
+		saveStruct->m_wScale = ms_RadarTrace[i].m_wScale;
+		saveStruct->m_eBlipDisplay = ms_RadarTrace[i].m_eBlipDisplay;
+		saveStruct->m_eRadarSprite = ms_RadarTrace[i].m_eRadarSprite;
+
+		SkipSaveBuf(buf, sizeof(sRadarTraceSave));
+	}
+
+VALIDATESAVEBUF(*size);
+}
+
 void
 CRadar::LoadTextures()
 {
@@ -1115,25 +1035,6 @@ void CRadar::RemoveRadarSections()
 			RemoveMapSection(i, j);
 }
 
-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);
-
-#ifdef MAP_ENHANCEMENTS
-	if (TargetMarkerId != -1) {
-		ClearBlip(TargetMarkerId);
-		TargetMarkerId = -1;
-	}
-#endif
-
-	for (int i = 0; i < NUMRADARBLIPS; i++)
-		WriteSaveBuf(buf, ms_RadarTrace[i]);
-
-VALIDATESAVEBUF(*size);
-}
-
 void CRadar::SetBlipSprite(int32 i, int32 icon)
 {
 	int index = CRadar::GetActualBlipArrayIndex(i);
@@ -1142,7 +1043,7 @@ void CRadar::SetBlipSprite(int32 i, int32 icon)
 	}
 }
 
-int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay display)
+int CRadar::SetCoordBlip(eBlipType type, CVector pos, uint32 color, eBlipDisplay display)
 {
 	int nextBlip;
 	for (nextBlip = 0; nextBlip < NUMRADARBLIPS; nextBlip++) {
@@ -1154,7 +1055,7 @@ int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay
 		return -1;
 #endif
 	ms_RadarTrace[nextBlip].m_eBlipType = type;
-	ms_RadarTrace[nextBlip].m_nColor = color;
+	ms_RadarTrace[nextBlip].m_nColor = RADAR_TRACE_MAGENTA;
 	ms_RadarTrace[nextBlip].m_bDim = true;
 	ms_RadarTrace[nextBlip].m_bInUse = true;
 	ms_RadarTrace[nextBlip].m_bShortRange = false;
@@ -1168,7 +1069,7 @@ int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay
 	return CRadar::GetNewUniqueBlipIndex(nextBlip);
 }
 
-int CRadar::SetShortRangeCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay display)
+int CRadar::SetShortRangeCoordBlip(eBlipType type, CVector pos, uint32 color, eBlipDisplay display)
 {
 	int index = SetCoordBlip(type, pos, color, display);
 	if (index == -1)
@@ -1177,7 +1078,7 @@ int CRadar::SetShortRangeCoordBlip(eBlipType type, CVector pos, int32 color, eBl
 	return index;
 }
 
-int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDisplay display)
+int CRadar::SetEntityBlip(eBlipType type, int32 handle, uint32 color, eBlipDisplay display)
 {
 	int nextBlip;
 	for (nextBlip = 0; nextBlip < NUMRADARBLIPS; nextBlip++) {
@@ -1189,7 +1090,7 @@ int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDispla
 		return -1;
 #endif
 	ms_RadarTrace[nextBlip].m_eBlipType = type;
-	ms_RadarTrace[nextBlip].m_nColor = color;
+	ms_RadarTrace[nextBlip].m_nColor = RADAR_TRACE_YELLOW;
 	ms_RadarTrace[nextBlip].m_bDim = true;
 	ms_RadarTrace[nextBlip].m_bInUse = true;
 	ms_RadarTrace[nextBlip].m_bShortRange = false;
@@ -1261,12 +1162,12 @@ void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red,
 	switch (mode)
 	{
 	case BLIP_MODE_TRIANGULAR_UP:
-		// size++; // VC does size + 1 for triangles
+		size++;
 		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
+		size++;
 		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;
@@ -1275,21 +1176,6 @@ void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red,
 		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;
 	}
-
-	// TODO(Miami): Map
-	// VC uses -1 for coords and -2 for entities but meh, I don't want to edit DrawBlips
-	if (FrontEndMenuManager.m_bMenuMapActive) {
-		bool alreadyThere = false;
-		for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
-			if (MapLegendList[i] == -1)
-				alreadyThere = true;
-		}
-		if (!alreadyThere) {
-			MapLegendList[MapLegendCounter] = -1;
-			MapLegendCounter++;
-			ArrowBlipColour1 = CRGBA(red, green, blue, alpha);
-		}
-	}
 }
 
 void CRadar::Shutdown()
@@ -1338,7 +1224,8 @@ void CRadar::Shutdown()
 
 void CRadar::StreamRadarSections(const CVector &posn)
 {
-	StreamRadarSections(Floor((2000.0f + posn.x) / 500.0f), Ceil(7.0f - (2000.0f + posn.y) / 500.0f));
+	if (!CStreaming::ms_disableStreaming)
+		StreamRadarSections(Floor((RADAR_MAX_X + posn.x) / RADAR_TILE_SIZE), Ceil((RADAR_NUM_TILES - 1) - (RADAR_MAX_Y + posn.y) / RADAR_TILE_SIZE));
 }
 
 void CRadar::StreamRadarSections(int32 x, int32 y)
@@ -1405,8 +1292,8 @@ void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D
 void
 CRadar::CalculateCachedSinCos()
 {
-	if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN || TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED
-		|| FrontEndMenuManager.m_bMenuMapActive ) {
+	if (/*TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN || TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED || */
+		FrontEndMenuManager.m_bMenuMapActive ) {
 		cachedSin = 0.0f;
 		cachedCos = 1.0f;
 	} else if (TheCamera.GetLookDirection() == LOOKING_FORWARD) {
@@ -1445,7 +1332,7 @@ CRadar::InitFrontEndMap()
 void
 CRadar::DrawYouAreHereSprite(float x, float y)
 {
-	static uint32 lastChange = 0;
+	static PauseModeTime lastChange = 0;
 	static bool show = true;
 
 	if (show) {
@@ -1461,13 +1348,30 @@ CRadar::DrawYouAreHereSprite(float x, float y)
 	}
 
 	if (show) {
-		float left = x - SCREEN_SCALE_X(12.0f);
-		float top = y;
-		float right = SCREEN_SCALE_X(12.0) + x;
-		float bottom = y - SCREEN_SCALE_Y(24.0f);
-		CentreSprite.Draw(CRect(left, top, right, bottom), CRGBA(255, 255, 255, 255));
+		const float left = x - SCREEN_SCALE_X(8.0f);
+		const float top = y - SCREEN_SCALE_Y(40.0f);
+		const float right = x + SCREEN_SCALE_X(40.0);
+		const float bottom = y + SCREEN_SCALE_Y(8.0f);
+		MapHereSprite.Draw(CRect(left + SCREEN_SCALE_X(2.f), top + SCREEN_SCALE_Y(2.f), right + SCREEN_SCALE_X(2.f), bottom + SCREEN_SCALE_Y(2.f)),
+			CRGBA(0, 0, 0, 255));
+
+		MapHereSprite.Draw(CRect(left, top, right, bottom), CRGBA(255, 255, 255, 255));
+
+		CFont::SetWrapx(right + SCREEN_SCALE_X(28.0f));
+		CFont::SetRightJustifyWrap(right);
+		CFont::SetBackGroundOnlyTextOff();
+		CFont::SetColor(CRGBA(255, 150, 225, 255));
+		CFont::SetDropShadowPosition(2);
+		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
+		CFont::SetCentreOff();
+		CFont::SetRightJustifyOff();
+		CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+		CFont::SetScale(SCREEN_SCALE_X(0.65f), SCREEN_SCALE_Y(0.95f));
+		CFont::PrintString(right, top, TheText.Get("MAP_YAH"));
+		CFont::SetDropShadowPosition(0);
+		CFont::DrawFonts();
 	}
-	MapLegendList[MapLegendCounter++] = RADAR_SPRITE_CENTRE;
+	MapLegendList[MapLegendCounter++] = RADAR_SPRITE_MAP_HERE;
 }
 
 #ifdef MAP_ENHANCEMENTS
@@ -1485,8 +1389,8 @@ CRadar::ToggleTargetMarker(float x, float y)
 			return;
 			
 		ms_RadarTrace[nextBlip].m_eBlipType = BLIP_COORD;
-		ms_RadarTrace[nextBlip].m_nColor = 0x333333FF;
-		ms_RadarTrace[nextBlip].m_bDim = 1;
+		ms_RadarTrace[nextBlip].m_nColor = RADAR_TRACE_GRAY;
+		ms_RadarTrace[nextBlip].m_bDim = 0;
 		ms_RadarTrace[nextBlip].m_bInUse = 1;
 		ms_RadarTrace[nextBlip].m_Radius = 1.0f;
 		CVector pos(x, y, CWorld::FindGroundZForCoord(x,y));
@@ -1505,3 +1409,287 @@ CRadar::ToggleTargetMarker(float x, float y)
 }
 #endif
 
+void
+CRadar::DrawEntityBlip(int32 blipId)
+{
+	CVector2D out;
+	CVector2D in;
+	CEntity *blipEntity;
+	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_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
+				if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
+					DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
+				} else {
+					const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
+					const 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);
+
+					if (FrontEndMenuManager.m_bMenuMapActive) {
+						bool alreadyThere = false;
+						for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
+							if (MapLegendList[i] == -2)
+								alreadyThere = true;
+						}
+						if (!alreadyThere) {
+							MapLegendList[MapLegendCounter] = -2;
+							MapLegendCounter++;
+							ArrowBlipColour2 = CRGBA((uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void
+CRadar::DrawCoordBlip(int32 blipId)
+{
+	CVector2D out;
+	CVector2D in;
+	if (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_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
+				if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
+					DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
+				} else {
+					const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
+					const 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);
+
+					if (FrontEndMenuManager.m_bMenuMapActive) {
+						bool alreadyThere = false;
+						for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
+							if (MapLegendList[i] == -1)
+								alreadyThere = true;
+						}
+						if (!alreadyThere) {
+							MapLegendList[MapLegendCounter] = -1;
+							MapLegendCounter++;
+							ArrowBlipColour1 = CRGBA((uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void
+CRadar::DrawLegend(int32 x, int32 y, int32 sprite)
+{
+	if (sprite < 0) {
+		static PauseModeTime lastChange = 0;
+		static int8 blipMode = 0;
+
+		CRGBA color;
+		if (sprite == -1) {
+			color = ArrowBlipColour1;
+		} else {
+			color = ArrowBlipColour2;
+		}
+
+		if (CTimer::GetTimeInMillisecondsPauseMode() - lastChange > 600) {
+			lastChange = CTimer::GetTimeInMillisecondsPauseMode();
+			if ( blipMode == 2 )
+				blipMode = 0;
+			else
+				++blipMode;
+		}
+
+		switch (blipMode) {
+			case BLIP_MODE_TRIANGULAR_UP:
+				CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(14.0f), y + SCREEN_SCALE_Y(13.0f), x + SCREEN_SCALE_X(2.0f), y + SCREEN_SCALE_Y(13.0f), x + SCREEN_SCALE_X(8.f), y + SCREEN_SCALE_Y(2.0f), x + SCREEN_SCALE_X(8.f), y + SCREEN_SCALE_Y(2.0f), CRGBA(0, 0, 0, 255));
+				CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(12.0f), y + SCREEN_SCALE_Y(12.0f), x + SCREEN_SCALE_X(4.0f), y + SCREEN_SCALE_Y(12.0f), x + SCREEN_SCALE_X(8.f), y + SCREEN_SCALE_Y(4.0f), x + SCREEN_SCALE_X(8.f), y + SCREEN_SCALE_Y(4.0f), color);
+				break;
+			case BLIP_MODE_TRIANGULAR_DOWN:
+				CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(14.0f), x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(14.0f), x + SCREEN_SCALE_X(2.f), y + SCREEN_SCALE_Y(3.0f), x + SCREEN_SCALE_X(2.f), y + SCREEN_SCALE_Y(3.0f), CRGBA(0, 0, 0, 255));
+				CSprite2d::Draw2DPolygon(x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(12.0f), x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(12.0f), x + SCREEN_SCALE_X(12.f), y + SCREEN_SCALE_Y(4.0f), x + SCREEN_SCALE_X(4.f), y + SCREEN_SCALE_Y(4.0f), color);
+				break;
+			case BLIP_MODE_SQUARE:
+				CSprite2d::DrawRect(CRect(x + SCREEN_SCALE_X(4.0f), y + SCREEN_SCALE_Y(3.0f), SCREEN_SCALE_X(12.0f) + x, SCREEN_SCALE_Y(12.0f) + y), CRGBA(0, 0, 0, 255));
+				CSprite2d::DrawRect(CRect(x + SCREEN_SCALE_X(5.0f), y + SCREEN_SCALE_Y(4.0f), SCREEN_SCALE_X(11.0f) + x, SCREEN_SCALE_Y(11.0f) + y), color);
+				break;
+		}
+
+	} else {
+		RadarSprites[sprite]->Draw(CRect(x, y, x + SCREEN_SCALE_X(16.f), y + SCREEN_SCALE_X(16.f)), CRGBA(255, 255, 255, 255));
+	}
+
+	wchar *text;
+	switch ( sprite ) {
+		case RADAR_SPRITE_ENTITY_BLIP:
+			text = TheText.Get("LG_38");
+		break;
+		case RADAR_SPRITE_COORD_BLIP:
+			text = TheText.Get("LG_35");
+		break;
+		case RADAR_SPRITE_MAP_HERE:
+			text = TheText.Get("LG_01");
+		break;
+		case RADAR_SPRITE_AVERY:
+			text = TheText.Get("LG_02");
+		break;
+		case RADAR_SPRITE_BIKER:
+			text = TheText.Get("LG_03");
+		break;
+		case RADAR_SPRITE_CORTEZ:
+			text = TheText.Get("LG_04");
+		break;
+		case RADAR_SPRITE_DIAZ:
+			text = TheText.Get("LG_05");
+		break;
+		case RADAR_SPRITE_KENT:
+			text = TheText.Get("LG_06");
+		break;
+		case RADAR_SPRITE_LAWYER:
+			text = TheText.Get("LG_07");
+		break;
+		case RADAR_SPRITE_PHIL:
+			text = TheText.Get("LG_08");
+		break;
+		case RADAR_SPRITE_BIKERS:
+			text = TheText.Get("LG_03");
+		break;
+		case RADAR_SPRITE_BOATYARD:
+			text = TheText.Get("LG_09");
+		break;
+		case RADAR_SPRITE_MALIBU_CLUB:
+			text = TheText.Get("LG_10");
+		break;
+		case RADAR_SPRITE_CUBANS:
+			text = TheText.Get("LG_11");
+		break;
+		case RADAR_SPRITE_FILM:
+			text = TheText.Get("LG_12");
+		break;
+		case RADAR_SPRITE_GUN:
+			text = TheText.Get("LG_13");
+		break;
+		case RADAR_SPRITE_HAITIANS:
+			text = TheText.Get("LG_14");
+		break;
+		case RADAR_SPRITE_HARDWARE:
+			text = TheText.Get("LG_15");
+		break;
+		case RADAR_SPRITE_SAVE:
+			text = TheText.Get("LG_16");
+		break;
+		case RADAR_SPRITE_STRIP:
+			text = TheText.Get("LG_37");
+		break;
+		case RADAR_SPRITE_ICE:
+			text = TheText.Get("LG_17");
+		break;
+		case RADAR_SPRITE_KCABS:
+			text = TheText.Get("LG_18");
+		break;
+		case RADAR_SPRITE_LOVEFIST:
+			text = TheText.Get("LG_19");
+		break;
+		case RADAR_SPRITE_PRINTWORKS:
+			text = TheText.Get("LG_20");
+		break;
+		case RADAR_SPRITE_PROPERTY:
+			text = TheText.Get("LG_21");
+		break;
+		case RADAR_SPRITE_SUNYARD:
+			text = TheText.Get("LG_36");
+		break;
+		case RADAR_SPRITE_SPRAY:
+			text = TheText.Get("LG_22");
+		break;
+		case RADAR_SPRITE_TSHIRT:
+			text = TheText.Get("LG_23");
+		break;
+		case RADAR_SPRITE_TOMMY:
+			text = TheText.Get("LG_24");
+		break;
+		case RADAR_SPRITE_PHONE:
+			text = TheText.Get("LG_25");
+		break;
+		case RADAR_SPRITE_RADIO_WILDSTYLE:
+			text = TheText.Get("LG_26");
+		break;
+		case RADAR_SPRITE_RADIO_FLASH:
+			text = TheText.Get("LG_27");
+		break;
+		case RADAR_SPRITE_RADIO_KCHAT:
+			text = TheText.Get("LG_28");
+		break;
+		case RADAR_SPRITE_RADIO_FEVER:
+			text = TheText.Get("LG_29");
+		break;
+		case RADAR_SPRITE_RADIO_VROCK:
+			text = TheText.Get("LG_30");
+		break;
+		case RADAR_SPRITE_RADIO_VCPR:
+			text = TheText.Get("LG_31");
+		break;
+		case RADAR_SPRITE_RADIO_ESPANTOSO:
+			text = TheText.Get("LG_32");
+		break;
+		case RADAR_SPRITE_RADIO_EMOTION:
+			text = TheText.Get("LG_33");
+		break;
+		case RADAR_SPRITE_RADIO_WAVE:
+			text = TheText.Get("LG_34");
+		break;
+		default:
+		break;
+	}
+	CFont::PrintString(SCREEN_SCALE_X(20.f) + x, SCREEN_SCALE_Y(3.0f) + y, text);
+}
diff --git a/src/core/Radar.h b/src/core/Radar.h
index 100da8f3..b5f34f1f 100644
--- a/src/core/Radar.h
+++ b/src/core/Radar.h
@@ -98,6 +98,17 @@ enum eRadarSprite
 
 enum
 {
+	RADAR_TRACE_RED,
+	RADAR_TRACE_GREEN,
+	RADAR_TRACE_LIGHT_BLUE,
+	RADAR_TRACE_GRAY,
+	RADAR_TRACE_YELLOW,
+	RADAR_TRACE_MAGENTA,
+	RADAR_TRACE_CYAN
+};
+
+enum
+{
 	BLIP_MODE_TRIANGULAR_UP = 0,
 	BLIP_MODE_TRIANGULAR_DOWN,
 	BLIP_MODE_SQUARE,
@@ -108,17 +119,39 @@ struct sRadarTrace
 	uint32 m_nColor;
 	uint32 m_eBlipType; // eBlipType
 	int32 m_nEntityHandle;
+	CVector m_vec2DPos;
+	CVector m_vecPos;
+	uint16 m_BlipIndex;
+	bool m_bDim;
+	bool m_bInUse;
+	bool m_bShortRange;
+	bool m_unused;
+	float m_Radius;
+	int16 m_wScale;
+	uint16 m_eBlipDisplay; // eBlipDisplay
+	uint16 m_eRadarSprite; // eRadarSprite
+};
+
+// Either that was a thing while saving/loading blips, or they added sizes of each field one by one. I want to do the former.
+#pragma pack(push,1)
+struct sRadarTraceSave
+{
+	uint32 m_nColor;
+	uint32 m_eBlipType; // eBlipType
+	int32 m_nEntityHandle;
 	CVector2D m_vec2DPos;
 	CVector m_vecPos;
 	uint16 m_BlipIndex;
 	bool m_bDim;
 	bool m_bInUse;
 	bool m_bShortRange;
+	bool m_unused;
 	float m_Radius;
 	int16 m_wScale;
 	uint16 m_eBlipDisplay; // eBlipDisplay
 	uint16 m_eRadarSprite; // eRadarSprite
 };
+#pragma pack(pop)
 
 // Values for screen space
 #define RADAR_LEFT (40.0f)
@@ -176,7 +209,7 @@ public:
 	static CRGBA ArrowBlipColour1;
 	static CRGBA ArrowBlipColour2;
 	static int16 MapLegendList[NUM_MAP_LEGENDS];
-	static uint16 MapLegendCounter;
+	static int16 MapLegendCounter;
 
 #ifdef MAP_ENHANCEMENTS
 	static int TargetMarkerId;
@@ -215,9 +248,9 @@ public:
 	static void RemoveRadarSections();
 	static void SaveAllRadarBlips(uint8*, uint32*);
 	static void SetBlipSprite(int32 i, int32 icon);
-	static int32 SetCoordBlip(eBlipType type, CVector pos, int32, eBlipDisplay);
-	static int32 SetEntityBlip(eBlipType type, int32, int32, eBlipDisplay);
-	static int32 SetShortRangeCoordBlip(eBlipType type, CVector pos, int32, eBlipDisplay);
+	static int32 SetCoordBlip(eBlipType type, CVector pos, uint32, eBlipDisplay);
+	static int32 SetEntityBlip(eBlipType type, int32, uint32, eBlipDisplay);
+	static int32 SetShortRangeCoordBlip(eBlipType type, CVector pos, uint32, eBlipDisplay);
 	static void SetRadarMarkerState(int32 i, bool flag);
 	static void ShowRadarMarker(CVector pos, uint32 color, float radius);
 	static void ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha);
@@ -229,7 +262,8 @@ public:
 	static void TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D &in);
 	static void TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &in);
 	static void TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D &in);
-
-	// no in CRadar in the game:	
 	static void CalculateCachedSinCos();
+	static void DrawEntityBlip(int32 blipId);
+	static void DrawCoordBlip(int32 blipId);
+	static void DrawLegend(int32, int32, int32);
 };
diff --git a/src/core/config.h b/src/core/config.h
index e2123597..770a7c2e 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -172,7 +172,6 @@ enum Config {
 #	define RANDOMSPLASH
 #	define VU_COLLISION
 #elif defined GTA_PC
-#	define GTA3_1_1_PATCH
 //#	define GTA3_STEAM_PATCH
 //# define GTAVC_JP_PATCH
 #	ifdef GTA_PS2_STUFF
@@ -263,7 +262,6 @@ enum Config {
 
 // Hud, frontend and radar
 //#define BETA_SLIDING_TEXT
-#define TRIANGULAR_BLIPS	// height indicating triangular radar blips, as in VC
 #define PC_MENU
 
 #ifndef PC_MENU
diff --git a/src/render/2dEffect.h b/src/render/2dEffect.h
index baf07342..8ad2b946 100644
--- a/src/render/2dEffect.h
+++ b/src/render/2dEffect.h
@@ -88,14 +88,10 @@ public:
 		if(type == EFFECT_LIGHT){
 			if(light.corona)
 				RwTextureDestroy(light.corona);
-#ifdef GTA3_1_1_PATCH
 			light.corona = nil;
-#endif
 			if(light.shadow)
 				RwTextureDestroy(light.shadow);
-#ifdef GTA3_1_1_PATCH
 			light.shadow = nil;
-#endif
 		}
 	}
 };
diff --git a/src/render/WaterCannon.cpp b/src/render/WaterCannon.cpp
index bd2b9a68..91304be3 100644
--- a/src/render/WaterCannon.cpp
+++ b/src/render/WaterCannon.cpp
@@ -11,6 +11,9 @@
 #include "Fire.h"
 #include "WaterLevel.h"
 #include "Camera.h"
+#include "Particle.h"
+
+// --MIAMI: file done
 
 #define WATERCANNONVERTS 4
 #define WATERCANNONINDEXES 12
@@ -64,7 +67,7 @@ void CWaterCannon::Update_OncePerFrame(int16 index)
 	
 	if (CTimer::GetTimeInMilliseconds() > m_nTimeCreated + WATERCANNON_LIFETIME )
 	{
-		m_nCur = (m_nCur + 1) % -NUM_SEGMENTPOINTS;
+		m_nCur = (m_nCur + 1) % NUM_SEGMENTPOINTS;
 		m_abUsed[m_nCur] = false;
 	}
 	
@@ -128,7 +131,7 @@ void CWaterCannon::Render(void)
 	RwIm3DVertexSetV(&WaterCannonVertices[2], v);
 	RwIm3DVertexSetV(&WaterCannonVertices[3], v);
 	
-	int16 pointA = m_nCur % -NUM_SEGMENTPOINTS;
+	int16 pointA = m_nCur % NUM_SEGMENTPOINTS;
 	
 	int16 pointB = pointA - 1;
 	if ( (pointA - 1) < 0 )
@@ -235,11 +238,16 @@ void CWaterCannon::PushPeds(void)
 							ped->m_vecMoveSpeed.x = (0.6f * m_avecVelocity[j].x + ped->m_vecMoveSpeed.x) * 0.5f;
 							ped->m_vecMoveSpeed.y = (0.6f * m_avecVelocity[j].y + ped->m_vecMoveSpeed.y) * 0.5f;
 							
-							ped->SetFall(2000, AnimationId(ANIM_KO_SKID_FRONT + localDir), 0);
-							
-							CFire *fire = ped->m_pFire;
-							if ( fire )
-								fire->Extinguish();
+							float pedSpeed2D = ped->m_vecMoveSpeed.Magnitude2D();
+
+							if ( pedSpeed2D > 0.2f ) {
+								ped->m_vecMoveSpeed.x *= (0.2f / pedSpeed2D);
+								ped->m_vecMoveSpeed.y *= (0.2f / pedSpeed2D);
+							}
+							ped->SetFall(2000, (AnimationId)(localDir + ANIM_KO_SKID_FRONT), 0);
+							CParticle::AddParticle(PARTICLE_STEAM_NY_SLOWMOTION, ped->GetPosition(), ped->m_vecMoveSpeed * 0.3f, 0, 0.5f);
+							CParticle::AddParticle(PARTICLE_CAR_SPLASH, ped->GetPosition(), ped->m_vecMoveSpeed * -0.3f + CVector(0.f, 0.f, 0.5f), 0, 0.5f,
+								CGeneral::GetRandomNumberInRange(0.f, 10.f), CGeneral::GetRandomNumberInRange(0.f, 90.f), 1);
 							
 							j = NUM_SEGMENTPOINTS;
 						}
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index 07304b77..85418edd 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -534,12 +534,13 @@ CameraSize(RwCamera * camera, RwRect * rect,
 			}
 		}
 
-		// BUG: game just changes camera raster's sizes, but this is a hack
-		if (( origSize.w != rect->w ) && ( origSize.h != rect->h ))
+		if (( origSize.w != rect->w ) || ( origSize.h != rect->h ))
 		{
 			RwRaster           *raster;
 			RwRaster           *zRaster;
 
+			// BUG: game just changes camera raster's sizes, but this is a hack
+#ifdef FIX_BUGS
 			/*
 			 * Destroy rasters...
 			 */
@@ -597,6 +598,13 @@ CameraSize(RwCamera * camera, RwRect * rect,
 				RwCameraSetRaster(camera, raster);
 				RwCameraSetZRaster(camera, zRaster);
 			}
+#else
+			raster = RwCameraGetRaster(camera);
+			zRaster = RwCameraGetZRaster(camera);
+			
+			raster->width = zRaster->width = rect->w;
+			raster->height = zRaster->height = rect->h;
+#endif
 		}
 
 		/* Figure out the view window */
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 08e5c021..319b7bb0 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -152,7 +152,7 @@ const char *_psGetUserFilesFolder()
 							&KeycbData) == ERROR_SUCCESS )
 		{
 			RegCloseKey(hKey);
-			strcat(szUserFiles, "\\GTA3 User Files");
+			strcat(szUserFiles, "\\GTA Vice City User Files");
 			_psCreateFolder(szUserFiles);
 			return szUserFiles;
 		}	
@@ -386,10 +386,6 @@ psInitialize(void)
 	
 	InitialiseLanguage();
 
-#ifndef GTA3_1_1_PATCH
-	FrontEndMenuManager.LoadSettings();
-#endif
-
 #endif
 	
 	gGameState = GS_START_UP;
@@ -422,7 +418,7 @@ psInitialize(void)
 	}
 	else if ( verInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS )
 	{
-		if ( verInfo.dwMajorVersion > 4 || verInfo.dwMajorVersion == 4 && verInfo.dwMinorVersion == 1 )
+		if ( verInfo.dwMajorVersion > 4 || verInfo.dwMajorVersion == 4 && verInfo.dwMinorVersion != 0 )
 		{
 			debug("Operating System is Win98\n");
 			_dwOperatingSystemVersion = OS_WIN98;
@@ -439,13 +435,9 @@ psInitialize(void)
 
 	
 #ifndef PS2_MENU
-
-#ifdef GTA3_1_1_PATCH
 	FrontEndMenuManager.LoadSettings();
 #endif
 
-#endif
-
 
 #ifdef _WIN32
 	MEMORYSTATUS memstats;
@@ -1250,14 +1242,17 @@ void resizeCB(GLFWwindow* window, int width, int height) {
 	* memory things don't work.
 	*/
 	/* redraw window */
-	if (RwInitialised && (gGameState == GS_PLAYING_GAME
 #ifndef MASTER
-		|| gGameState == GS_ANIMVIEWER
-#endif
-	                      ))
+	if (RwInitialised && (gGameState == GS_PLAYING_GAME || gGameState == GS_ANIMVIEWER))
 	{
-		RsEventHandler((gGameState == GS_PLAYING_GAME ? rsIDLE : rsANIMVIEWER), (void*)TRUE);
+		RsEventHandler((gGameState == GS_PLAYING_GAME ? rsIDLE : rsANIMVIEWER), (void *)TRUE);
 	}
+#else
+	if (RwInitialised && gGameState == GS_PLAYING_GAME)
+	{
+		RsEventHandler(rsIDLE, (void *)TRUE);
+	}
+#endif
 
 	if (RwInitialised && height > 0 && width > 0) {
 		RwRect r;
@@ -1765,6 +1760,7 @@ main(int argc, char *argv[])
 						printf("Into TheGame!!!\n");
 #else				
 						LoadingScreen(nil, nil, "loadsc0");
+						// LoadingScreen(nil, nil, "loadsc0"); // duplicate
 #endif
 						if ( !CGame::InitialiseOnceAfterRW() )
 							RsGlobal.quit = TRUE;
@@ -1781,6 +1777,7 @@ main(int argc, char *argv[])
 					case GS_INIT_FRONTEND:
 					{
 						LoadingScreen(nil, nil, "loadsc0");
+						// LoadingScreen(nil, nil, "loadsc0"); // duplicate
 						
 						FrontEndMenuManager.m_bGameNotLoaded = true;
 						
diff --git a/src/skel/win/resource.h b/src/skel/win/resource.h
index 84dffb95..93f14216 100644
--- a/src/skel/win/resource.h
+++ b/src/skel/win/resource.h
@@ -8,7 +8,7 @@
 #define IDEXIT                          1002
 #define IDC_SELECTDEVICE                1005
 
-#define IDI_MAIN_ICON                   1042
+#define IDI_MAIN_ICON                   100
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 1d1037af..149c9045 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -189,7 +189,7 @@ const char *_psGetUserFilesFolder()
 							&KeycbData) == ERROR_SUCCESS )
 		{
 			RegCloseKey(hKey);
-			strcat(szUserFiles, "\\GTA3 User Files");
+			strcat(szUserFiles, "\\GTA Vice City User Files");
 			_psCreateFolder(szUserFiles);
 			return szUserFiles;
 		}	
@@ -650,10 +650,6 @@ psInitialize(void)
 	C_PcSave::SetSaveDirectory(_psGetUserFilesFolder());
 	
 	InitialiseLanguage();
-#ifndef GTA3_1_1_PATCH
-	FrontEndMenuManager.LoadSettings();
-#endif
-
 #endif
 	
 	gGameState = GS_START_UP;
@@ -688,7 +684,7 @@ psInitialize(void)
 	}
 	else if ( verInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS )
 	{
-		if ( verInfo.dwMajorVersion > 4 || verInfo.dwMajorVersion == 4 && verInfo.dwMinorVersion == 1 )
+		if ( verInfo.dwMajorVersion > 4 || verInfo.dwMajorVersion == 4 && verInfo.dwMinorVersion != 0 )
 		{
 			debug("Operating System is Win98\n");
 			_dwOperatingSystemVersion = OS_WIN98;
@@ -701,13 +697,9 @@ psInitialize(void)
 	}
 
 #ifndef PS2_MENU
-
-#ifdef GTA3_1_1_PATCH
 	FrontEndMenuManager.LoadSettings();
 #endif
 
-#endif
-
 	dwDXVersion = GetDXVersion();
 	debug("DirectX version 0x%x\n", dwDXVersion);
 	
@@ -945,8 +937,7 @@ void HandleGraphEvent(void)
 
 /*
  *****************************************************************************
- */
- 
+ */ 
 LRESULT CALLBACK
 MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -1016,10 +1007,17 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
 			RECT				rect;
 
 			/* redraw window */
+#ifndef MASTER
 			if (RwInitialised && (gGameState == GS_PLAYING_GAME || gGameState == GS_ANIMVIEWER))
 			{
 				RsEventHandler((gGameState == GS_PLAYING_GAME ? rsIDLE : rsANIMVIEWER), (void *)TRUE);
 			}
+#else
+			if (RwInitialised && gGameState == GS_PLAYING_GAME)
+			{
+				RsEventHandler(rsIDLE, (void *)TRUE);
+			}
+#endif
 
 			/* Manually resize window */
 			rect.left = rect.top = 0;
@@ -1327,7 +1325,7 @@ InitApplication(HANDLE instance)
 	windowClass.cbClsExtra = 0;
 	windowClass.cbWndExtra = 0;
 	windowClass.hInstance = (HINSTANCE)instance;
-	windowClass.hIcon = nil;
+	windowClass.hIcon = LoadIcon((HINSTANCE)instance, (LPCSTR)IDI_MAIN_ICON);
 	windowClass.hCursor = LoadCursor(nil, IDC_ARROW);
 	windowClass.hbrBackground = nil;
 	windowClass.lpszMenuName = NULL;
@@ -1382,17 +1380,17 @@ UINT GetBestRefreshRate(UINT width, UINT height, UINT depth)
 #endif	
 		if ( mode.Width == width && mode.Height == height && mode.Format == format )
 		{
-			if ( mode.RefreshRate == 0 )
+			if ( mode.RefreshRate == 0 ) {
+				d3d->Release();
 				return 0;
+			}
 
 			if ( mode.RefreshRate < refreshRate && mode.RefreshRate >= 60 )
 				refreshRate = mode.RefreshRate;
 		}
 	}
 	
-#ifdef FIX_BUGS
 	d3d->Release();
-#endif
 	
 	if ( refreshRate == -1 )
 		return -1;
@@ -2255,6 +2253,8 @@ WinMain(HINSTANCE instance,
 
 						if ( startupDeactivate || ControlsManager.GetJoyButtonJustDown() != 0 )
 							++gGameState;
+						else if ( CPad::GetPad(0)->NewState.CheckForInput() )
+							++gGameState;
 						else if ( CPad::GetPad(0)->GetLeftMouseJustDown() )
 							++gGameState;
 						else if ( CPad::GetPad(0)->GetEnterJustDown() )
@@ -2292,6 +2292,8 @@ WinMain(HINSTANCE instance,
 
 						if ( startupDeactivate || ControlsManager.GetJoyButtonJustDown() != 0 )
 							++gGameState;
+						else if ( CPad::GetPad(0)->NewState.CheckForInput() )
+							++gGameState;
 						else if ( CPad::GetPad(0)->GetLeftMouseJustDown() )
 							++gGameState;
 						else if ( CPad::GetPad(0)->GetEnterJustDown() )
@@ -2328,6 +2330,7 @@ WinMain(HINSTANCE instance,
 						printf("Into TheGame!!!\n");
 #else				
 						LoadingScreen(nil, nil, "loadsc0");
+						// LoadingScreen(nil, nil, "loadsc0"); // duplicate
 #endif
 						if ( !CGame::InitialiseOnceAfterRW() )
 							RsGlobal.quit = TRUE;
@@ -2345,6 +2348,7 @@ WinMain(HINSTANCE instance,
 					case GS_INIT_FRONTEND:
 					{
 						LoadingScreen(nil, nil, "loadsc0");
+						// LoadingScreen(nil, nil, "loadsc0"); // duplicate
 						
 						FrontEndMenuManager.m_bGameNotLoaded = true;