30 files changed, 1461 insertions, 812 deletions

diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h
index 05a0d7c3..2a5b83cf 100644
--- a/src/audio/soundlist.h
+++ b/src/audio/soundlist.h
@@ -188,7 +188,7 @@ enum eSound : uint16
 	SOUND_186, // makes same sound with 40
 	SOUND_187, // makes same sound with 46
 	SOUND_MELEE_ATTACK_START,
-	SOUND_189,
+	SOUND_SKATING,
 	SOUND_WEAPON_MINIGUN_ATTACK,
 	SOUND_WEAPON_MINIGUN_2,
 	SOUND_WEAPON_MINIGUN_3,
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp
index 71f6c8e5..4f1703f2 100644
--- a/src/control/Phones.cpp
+++ b/src/control/Phones.cpp
@@ -284,7 +284,6 @@ CPhoneInfo::Initialise(void)
 		CBuilding *building = pool->GetSlot(i);
 		if (building) {
 			if (building->GetModelIndex() == MI_PHONEBOOTH1) {
-				assert(m_nMax < ARRAY_SIZE(m_aPhones) && "NUMPHONES should be increased");
 				CPhone *maxPhone = &m_aPhones[m_nMax];
 				maxPhone->m_nState = PHONE_STATE_FREE;
 				maxPhone->m_vecPos = building->GetPosition();
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index e1ab0310..88a62f4e 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -3225,9 +3225,8 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 			UpdateCompareFlag(ped->IsWithinArea(x1, y1, x2, y2));
 		else
 			UpdateCompareFlag(ped->m_pMyVehicle->IsWithinArea(x1, y1, x2, y2));
-		if (!ScriptParams[5])
-			return 0;
-		CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, MAP_Z_LOW_LIMIT);
+		if (ScriptParams[5])
+			CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, MAP_Z_LOW_LIMIT);
 		if (CTheScripts::DbgFlag)
 			CTheScripts::DrawDebugSquare(x1, y1, x2, y2);
 		return 0;
@@ -3246,9 +3245,8 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 			UpdateCompareFlag(ped->m_pMyVehicle->IsWithinArea(x1, y1, z1, x2, y2, z2));
 		else
 			UpdateCompareFlag(ped->IsWithinArea(x1, y1, z1, x2, y2, z2));
-		if (!ScriptParams[7])
-			return 0;
-		CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, (z1 + z2) / 2);
+		if (ScriptParams[7])
+			CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, (z1 + z2) / 2);
 		if (CTheScripts::DbgFlag)
 			CTheScripts::DrawDebugCube(x1, y1, z1, x2, y2, z2);
 		return 0;
@@ -4061,9 +4059,8 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		float x2 = *(float*)&ScriptParams[3];
 		float y2 = *(float*)&ScriptParams[4];
 		UpdateCompareFlag(vehicle->IsWithinArea(x1, y1, x2, y2));
-		if (!ScriptParams[5])
-			return 0;
-		CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, MAP_Z_LOW_LIMIT);
+		if (ScriptParams[5])
+			CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, MAP_Z_LOW_LIMIT);
 		if (CTheScripts::DbgFlag)
 			CTheScripts::DrawDebugSquare(x1, y1, x2, y2);
 		return 0;
@@ -4080,9 +4077,8 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		float y2 = *(float*)&ScriptParams[5];
 		float z2 = *(float*)&ScriptParams[6];
 		UpdateCompareFlag(vehicle->IsWithinArea(x1, y1, z1, x2, y2, z2));
-		if (!ScriptParams[7])
-			return 0;
-		CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, (z1 + z2) / 2);
+		if (ScriptParams[7])
+			CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, (z1 + z2) / 2);
 		if (CTheScripts::DbgFlag)
 			CTheScripts::DrawDebugCube(x1, y1, z1, x2, y2, z2);
 		return 0;
@@ -4799,9 +4795,8 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		float y2 = *(float*)&ScriptParams[4];
 		UpdateCompareFlag(pVehicle->GetStatus() == STATUS_WRECKED &&
 			pVehicle->IsWithinArea(x1, y1, x2, y2));
-		if (!ScriptParams[5])
-			return 0;
-		CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, MAP_Z_LOW_LIMIT);
+		if (ScriptParams[5])
+			CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, MAP_Z_LOW_LIMIT);
 		if (CTheScripts::DbgFlag)
 			CTheScripts::DrawDebugSquare(x1, y1, x2, y2);
 		return 0;
@@ -4819,9 +4814,8 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		float z2 = *(float*)&ScriptParams[6];
 		UpdateCompareFlag(pVehicle->GetStatus() == STATUS_WRECKED &&
 			pVehicle->IsWithinArea(x1, y1, z1, x2, y2, z2));
-		if (!ScriptParams[7])
-			return 0;
-		CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, (z1 + z2) / 2);
+		if (ScriptParams[7])
+			CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, (z1 + z2) / 2);
 		if (CTheScripts::DbgFlag)
 			CTheScripts::DrawDebugCube(x1, y1, z1, x2, y2, z2);
 		return 0;
@@ -7676,9 +7670,8 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		float x2 = *(float*)&ScriptParams[3];
 		float y2 = *(float*)&ScriptParams[4];
 		UpdateCompareFlag(pPed->bIsShooting && pPed->IsWithinArea(x1, y1, x2, y2));
-		if (!ScriptParams[5])
-			return 0;
-		CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, MAP_Z_LOW_LIMIT);
+		if (ScriptParams[5])
+			CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, MAP_Z_LOW_LIMIT);
 		if (CTheScripts::DbgFlag)
 			CTheScripts::DrawDebugSquare(x1, y1, x2, y2);
 		return 0;
@@ -7693,9 +7686,8 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		float x2 = *(float*)&ScriptParams[3];
 		float y2 = *(float*)&ScriptParams[4];
 		UpdateCompareFlag(pPed->bIsShooting && pPed->IsWithinArea(x1, y1, x2, y2));
-		if (!ScriptParams[5])
-			return 0;
-		CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, MAP_Z_LOW_LIMIT);
+		if (ScriptParams[5])
+			CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, x1, y1, x2, y2, MAP_Z_LOW_LIMIT);
 		if (CTheScripts::DbgFlag)
 			CTheScripts::DrawDebugSquare(x1, y1, x2, y2);
 		return 0;
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 4c205675..a3b15ac1 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -24,7 +24,6 @@
 #include "GenericGameStorage.h"
 #include "Script.h"
 #include "Camera.h"
-#include "MenuScreens.h"
 #include "ControllerConfig.h"
 #include "Vehicle.h"
 #include "MBlur.h"
@@ -214,75 +213,6 @@ ScaleAndCenterX(float x)
 
 // --- Functions not in the game/inlined starts
 
-bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
-void DoRWStuffEndOfFrame(void);
-
-#ifdef PS2_LIKE_MENU
-void
-CMenuManager::SwitchToNewScreen(int8 screen)
-{
-	if (reverseAlpha) {
-			m_nPrevScreen = m_nCurrScreen;
-			m_nCurrScreen = pendingScreen;
-			m_nCurrOption = pendingOption;
-			reverseAlpha = false;
-			if (updateDelay)
-				m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
-	}
-	if (withReverseAlpha) {
-		pendingOption = option;
-		pendingScreen = screen;
-		reverseAlpha = true;
-	} else {
-		m_nPrevScreen = m_nCurrScreen;
-		m_nCurrScreen = screen;
-		m_nCurrOption = option;
-		if (updateDelay)
-			m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
-	}
-	m_nMenuFadeAlpha = 255;
-}
-#else
-
-// --MIAMI: Done except using VC's gMenuPages
-void
-CMenuManager::SwitchToNewScreen(int8 screen)
-{
-	bMenuChangeOngoing = true;
-	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
-	DrawBackground(true);
-	DoRWStuffEndOfFrame();
-	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
-	DrawBackground(true);
-	DoRWStuffEndOfFrame();
-	m_nPrevScreen = m_nCurrScreen;
-	m_ShowEmptyBindingError = false;
-	ResetHelperText();
-
-	ThingsToDoBeforeLeavingPage();
-
-	if (screen == -2) {
-		int oldScreen = aScreens[m_nCurrScreen].m_PreviousPage;
-		int oldOption = (m_nCurrScreen == MENUPAGE_NEW_GAME ? 0 : (m_nCurrScreen == MENUPAGE_OPTIONS ? 1 : (m_nCurrScreen == MENUPAGE_EXIT ? 2 : aScreens[m_nCurrScreen].m_ParentEntry)));
-
-		m_nCurrOption = oldOption;
-		m_nCurrScreen = oldScreen;
-	} else if (screen == 0) {
-		m_nCurrScreen = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu;
-		m_nCurrOption = 0;
-	} else {
-		m_nCurrOption = 0;
-		m_nCurrScreen = screen;
-	}
-
-	if (m_nCurrScreen == MENUPAGE_CHOOSE_SAVE_SLOT)
-		m_nCurrOption = 8;
-	m_nMenuFadeAlpha = 0;
-	m_nOptionHighlightTransitionBlend = 0;
-	m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
-}
-#endif
-
 inline void
 CMenuManager::ScrollUpListByOne() 
 {
@@ -349,7 +279,6 @@ CMenuManager::PageDownList(bool playSoundOnSuccess)
 	}
 }
 
-// TODO(Miami)
 inline void
 CMenuManager::ThingsToDoBeforeLeavingPage()
 {
@@ -373,13 +302,123 @@ CMenuManager::ThingsToDoBeforeLeavingPage()
 		CPlayerSkin::EndFrontendSkinEdit();
 	}
 
-	if ((m_nCurrScreen == MENUPAGE_SKIN_SELECT) || (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS)) {
-		m_nTotalListRow = 0;
+#ifdef CUSTOM_FRONTEND_OPTIONS
+	for (int i = 0; i < numCustomFrontendOptions; i++) {
+		FrontendOption& option = customFrontendOptions[i];
+		if (option.type != FEOPTION_REDIRECT && option.type != FEOPTION_GOBACK && m_nCurrScreen == option.screen) {
+			if (option.returnPrevPageFunc)
+				option.returnPrevPageFunc();
+
+			if (m_nCurrOption == option.screenOptionOrder && option.type == FEOPTION_DYNAMIC)
+				option.buttonPressFunc(FEOPTION_ACTION_FOCUSLOSS);
+
+			if (option.onlyApplyOnEnter)
+				option.displayedValue = *option.value;
+		}
+	}
+#endif
+}
+
+int8
+CMenuManager::GetPreviousPageOption()
+{
+#ifndef CUSTOM_FRONTEND_OPTIONS
+	return (!m_bGameNotLoaded ? aScreens[m_nCurrScreen].m_ParentEntry :
+		(m_nCurrScreen == MENUPAGE_NEW_GAME ? 0 : (m_nCurrScreen == MENUPAGE_OPTIONS ? 1 : (m_nCurrScreen == MENUPAGE_EXIT ? 2 : aScreens[m_nCurrScreen].m_ParentEntry))));
+#else
+	int8 prevPage = aScreens[m_nCurrScreen].m_PreviousPage;
+
+	if (prevPage == -1) // Game also does same
+		return 0;
+
+	prevPage = prevPage == MENUPAGE_NONE ? (!m_bGameNotLoaded ? MENUPAGE_PAUSE_MENU : MENUPAGE_START_MENU) : prevPage;
+
+	for (int i = 0; i < NUM_MENUROWS; i++) {
+		if (aScreens[prevPage].m_aEntries[i].m_TargetMenu == m_nCurrScreen) {
+			return i;
+		}
 	}
+
+	// Couldn't find current screen option on previous page, use default behaviour (maybe save-related screen?)
+	return (!m_bGameNotLoaded ? aScreens[m_nCurrScreen].m_ParentEntry :
+		(m_nCurrScreen == MENUPAGE_NEW_GAME ? 0 : (m_nCurrScreen == MENUPAGE_OPTIONS ? 1 : (m_nCurrScreen == MENUPAGE_EXIT ? 2 : aScreens[m_nCurrScreen].m_ParentEntry))));
+#endif
 }
 
 // ------ Functions not in the game/inlined ends
 
+bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
+void DoRWStuffEndOfFrame(void);
+
+#ifdef PS2_LIKE_MENU
+void
+CMenuManager::SwitchToNewScreen(int8 screen)
+{
+	if (reverseAlpha) {
+			m_nPrevScreen = m_nCurrScreen;
+			m_nCurrScreen = pendingScreen;
+			m_nCurrOption = pendingOption;
+			reverseAlpha = false;
+			if (updateDelay)
+				m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
+	}
+	if (withReverseAlpha) {
+		pendingOption = option;
+		pendingScreen = screen;
+		reverseAlpha = true;
+	} else {
+		m_nPrevScreen = m_nCurrScreen;
+		m_nCurrScreen = screen;
+		m_nCurrOption = option;
+		if (updateDelay)
+			m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
+	}
+	m_nMenuFadeAlpha = 255;
+}
+#else
+
+// --MIAMI: Done
+void
+CMenuManager::SwitchToNewScreen(int8 screen)
+{
+	bMenuChangeOngoing = true;
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+	DrawBackground(true);
+	DoRWStuffEndOfFrame();
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+	DrawBackground(true);
+	DoRWStuffEndOfFrame();
+	m_nPrevScreen = m_nCurrScreen;
+	m_ShowEmptyBindingError = false;
+	ResetHelperText();
+
+	ThingsToDoBeforeLeavingPage();
+
+	if (screen == -2) {
+		int oldScreen = aScreens[m_nCurrScreen].m_PreviousPage;
+		int oldOption = GetPreviousPageOption();
+
+		m_nCurrOption = oldOption;
+		m_nCurrScreen = oldScreen;
+	} else if (screen == 0) {
+		m_nCurrScreen = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu;
+		m_nCurrOption = 0;
+	} else {
+		m_nCurrOption = 0;
+		m_nCurrScreen = screen;
+	}
+
+	if (m_nPrevScreen == MENUPAGE_SKIN_SELECT || m_nPrevScreen == MENUPAGE_KEYBOARD_CONTROLS)
+		m_nTotalListRow = 0;
+
+	if (m_nCurrScreen == MENUPAGE_CHOOSE_SAVE_SLOT)
+		m_nCurrOption = 8;
+	m_nMenuFadeAlpha = 0;
+	m_nOptionHighlightTransitionBlend = 0;
+	m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
+}
+#endif
+
 CMenuManager::CMenuManager()
 {
 	m_StatsScrollSpeed = 150.0f;
@@ -463,7 +502,7 @@ CMenuManager::Initialise(void)
 	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
 	DoRWStuffEndOfFrame();
 	m_AllowNavigation = false;
-	m_menuTransitionProgress = -50;
+	m_menuTransitionProgress = -50; // to start from black
 	m_nMenuFadeAlpha = 0;
 	m_nCurrOption = 0;
 	m_nOptionHighlightTransitionBlend = 0;
@@ -1172,6 +1211,32 @@ CMenuManager::DrawStandardMenus(bool drawCurrScreen)
 						rightText = TheText.Get("FEA_NM3");
 					}
 					break;
+#ifdef CUSTOM_FRONTEND_OPTIONS
+				case MENUACTION_TRIGGERFUNC:
+					FrontendOption& option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu];
+					if (m_nCurrScreen == option.screen && i == option.screenOptionOrder) {
+						leftText = (wchar*)option.leftText;
+						if (option.type == FEOPTION_SELECT) {
+							if (option.displayedValue >= option.numRightTexts || option.displayedValue < 0)
+								option.displayedValue = 0;
+
+							rightText = (wchar*)option.rightTexts[option.displayedValue];
+
+						} else if (option.type == FEOPTION_DYNAMIC) {
+							if (option.drawFunc) {
+								bool isOptionDisabled = false;
+								rightText = option.drawFunc(&isOptionDisabled);
+								if (isOptionDisabled)
+									CFont::SetColor(CRGBA(DARKMENUOPTION_COLOR.r, DARKMENUOPTION_COLOR.g, DARKMENUOPTION_COLOR.b, FadeIn(255)));
+							}
+						}
+					} else {
+						debug("A- screen:%d option:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, i, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu, option.screen, option.screenOptionOrder);
+						assert(0 && "Custom frontend options is borked");
+					}
+
+					break;
+#endif
 				}
 
 				// Highlight trapezoid
@@ -1326,6 +1391,24 @@ CMenuManager::DrawStandardMenus(bool drawCurrScreen)
 						}
 					}
 #endif
+#ifdef CUSTOM_FRONTEND_OPTIONS
+					static int lastOption = m_nCurrOption;
+
+					if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action == MENUACTION_TRIGGERFUNC) {
+						FrontendOption& option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu];
+						if (option.onlyApplyOnEnter && m_nCurrOption != i)
+							option.displayedValue = *option.value;
+
+						if (m_nCurrOption != lastOption && lastOption == i) {
+							FrontendOption& oldOption = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[lastOption].m_TargetMenu];
+							if (oldOption.type == FEOPTION_DYNAMIC)
+								oldOption.buttonPressFunc(FEOPTION_ACTION_FOCUSLOSS);
+						}
+					}
+
+					if (i == MAX_MENUROWS - 1 || aScreens[m_nCurrScreen].m_aEntries[i + 1].m_EntryName[0] == '\0')
+						lastOption = m_nCurrOption;
+#endif
 
 					// TODO(Miami): check
 					// Sliders
@@ -1955,10 +2038,10 @@ CMenuManager::DrawControllerSetupScreen()
 
 			float curOptY = i * rowHeight + yStart;
 			if (m_nMousePosY > MENU_Y(curOptY) && m_nMousePosY < MENU_Y(rowHeight + curOptY)) {
-					if (m_nPrevOption != i && m_nCurrExLayer == HOVEROPTION_LIST)
+					if (m_nOptionMouseHovering != i && m_nCurrExLayer == HOVEROPTION_LIST)
 						DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 
-					m_nPrevOption = i;
+					m_nOptionMouseHovering = i;
 					if (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY) {
 						m_nCurrExLayer = HOVEROPTION_LIST;
 						m_nSelectedListRow = i;
@@ -2660,7 +2743,7 @@ CMenuManager::DrawPlayerSetupScreen()
 
 			if (m_nMousePosX > MENU_X_LEFT_ALIGNED(PLAYERSETUP_LIST_LEFT) && m_nMousePosX < MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT)) {
 				if (m_nMousePosY > MENU_Y(rowStartY) && m_nMousePosY < MENU_Y(rowEndY)) {
-					m_nPrevOption = rowIdx;
+					m_nOptionMouseHovering = rowIdx;
 					if (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY) {
 						m_nCurrExLayer = HOVEROPTION_LIST;
 					}
@@ -3023,6 +3106,10 @@ CMenuManager::InitialiseChangedLanguageSettings()
 		default:
 			break;
 		}
+
+#ifdef CUSTOM_FRONTEND_OPTIONS
+		CustomFrontendOptionsPopulate();
+#endif
 	}
 }
 
@@ -3618,7 +3705,7 @@ CMenuManager::ProcessButtonPresses(void)
 			m_nMousePosY < MENU_Y(aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Y + MENU_DEFAULT_LINE_HEIGHT)) {
 			static int oldScreen = m_nCurrScreen;
 
-			m_nPrevOption = rowToCheck;
+			m_nOptionMouseHovering = rowToCheck;
 			if (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY) {
 				m_nCurrOption = rowToCheck;
 				m_bShowMouse = true;
@@ -3632,7 +3719,7 @@ CMenuManager::ProcessButtonPresses(void)
 			break;
 		}
 		if (m_bShowMouse && m_nMenuFadeAlpha == 255) {
-			m_nPrevOption = oldOption;
+			m_nOptionMouseHovering = oldOption;
 			m_nCurrOption = oldOption;
 		}
 	}
@@ -3641,7 +3728,7 @@ CMenuManager::ProcessButtonPresses(void)
 		if (oldOption != m_nCurrOption) {
 			if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_LABEL) {
 				++m_nCurrOption;
-				++m_nPrevOption;
+				++m_nOptionMouseHovering;
 			}
 			m_nOptionHighlightTransitionBlend = 0;
 			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
@@ -3923,7 +4010,7 @@ CMenuManager::ProcessButtonPresses(void)
 			if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_RESUME &&
 #endif
 				(m_nHoverOption == HOVEROPTION_RANDOM_ITEM)) {
-				m_nCurrOption = m_nPrevOption;
+				m_nCurrOption = m_nOptionMouseHovering;
 				optionSelected = true;
 			}
 		} else if (CPad::GetPad(0)->GetLeftMouseJustDown()) {
@@ -3937,7 +4024,7 @@ CMenuManager::ProcessButtonPresses(void)
 				OutputDebugString("FRONTEND RADIO STATION CHANGED");
 			} else if (m_nHoverOption == HOVEROPTION_RANDOM_ITEM
 				&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_RESUME) {
-				m_nCurrOption = m_nPrevOption;
+				m_nCurrOption = m_nOptionMouseHovering;
 				optionSelected = true;
 			}
 #else
@@ -4024,7 +4111,7 @@ CMenuManager::ProcessButtonPresses(void)
 				break;
 			case HOVEROPTION_RANDOM_ITEM:
 				if (((m_nCurrOption != 0) || (m_nCurrScreen != MENUPAGE_PAUSE_MENU)) {
-					m_nCurrOption = m_nPrevOption;
+					m_nCurrOption = m_nOptionMouseHovering;
 						optionSelected = true;
 				}
 				break;
@@ -4358,26 +4445,6 @@ CMenuManager::ProcessButtonPresses(void)
 					InitialiseChangedLanguageSettings();
 					SaveSettings();
 					break;
-#ifdef MORE_LANGUAGES
-				case MENUACTION_LANG_PL:
-					m_PrefsLanguage = LANGUAGE_POLISH;
-					m_bFrontEnd_ReloadObrTxtGxt = true;
-					InitialiseChangedLanguageSettings();
-					SaveSettings();
-					break;
-				case MENUACTION_LANG_RUS:
-					m_PrefsLanguage = LANGUAGE_RUSSIAN;
-					m_bFrontEnd_ReloadObrTxtGxt = true;
-					CMenuManager::InitialiseChangedLanguageSettings();
-					SaveSettings();
-					break;
-				case MENUACTION_LANG_JAP:
-					m_PrefsLanguage = LANGUAGE_JAPANESE;
-					m_bFrontEnd_ReloadObrTxtGxt = true;
-					InitialiseChangedLanguageSettings();
-					SaveSettings();
-					break;
-#endif
 				case MENUACTION_POPULATESLOTS_CHANGEMENU:
 					PcSaveHelper.PopulateSlotInfo();
 
@@ -4540,7 +4607,6 @@ CMenuManager::ProcessButtonPresses(void)
 					} else if (m_nCurrScreen == MENUPAGE_CONTROLLER_PC) {
 						ControlsManager.MakeControllerActionsBlank();
 						ControlsManager.InitDefaultControlConfiguration();
-						MousePointerStateHelper.GetMouseSetUp();
 						ControlsManager.InitDefaultControlConfigMouse(MousePointerStateHelper.GetMouseSetUp());
 #if !defined RW_GL3
 						if (AllValidWinJoys.m_aJoys[JOYSTICK1].m_bInitialised) {
@@ -4595,6 +4661,33 @@ CMenuManager::ProcessButtonPresses(void)
 					}
 					break;
 				}
+#ifdef CUSTOM_FRONTEND_OPTIONS
+				case MENUACTION_TRIGGERFUNC:
+					FrontendOption& option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu];
+					if (m_nCurrScreen == option.screen && m_nCurrOption == option.screenOptionOrder) {
+						if (option.type == FEOPTION_SELECT) {
+							if (!option.onlyApplyOnEnter) {
+								option.displayedValue++;
+								if (option.displayedValue >= option.numRightTexts || option.displayedValue < 0)
+									option.displayedValue = 0;
+							}
+							option.changeFunc(option.displayedValue);
+							*option.value = option.displayedValue;
+
+						} else if (option.type == FEOPTION_DYNAMIC) {
+							option.buttonPressFunc(FEOPTION_ACTION_SELECT);
+						} else if (option.type == FEOPTION_REDIRECT) {
+							ChangeScreen(option.to, option.option, true, option.fadeIn);
+						} else if (option.type == FEOPTION_GOBACK) {
+							goBack = true;
+						}
+					} else {
+						debug("B- screen:%d option:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, m_nCurrOption, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, option.screen, option.screenOptionOrder);
+						assert(0 && "Custom frontend options are borked");
+					}
+
+					break;
+#endif
 			}
 		}
 		ProcessOnOffMenuOptions();
@@ -4641,6 +4734,9 @@ CMenuManager::ProcessButtonPresses(void)
 
 		if (oldScreen != -1) {
 			ThingsToDoBeforeLeavingPage();
+			if ((m_nCurrScreen == MENUPAGE_SKIN_SELECT) || (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS)) {
+				m_nTotalListRow = 0;
+			}
 
 #ifdef PS2_LIKE_MENU
 			if (!bottomBarActive &&
@@ -4797,6 +4893,36 @@ CMenuManager::ProcessButtonPresses(void)
 				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 				SaveSettings();
 				break;
+#ifdef CUSTOM_FRONTEND_OPTIONS
+			case MENUACTION_TRIGGERFUNC:
+				FrontendOption& option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu];
+				if (m_nCurrScreen == option.screen && m_nCurrOption == option.screenOptionOrder) {
+					if (option.type == FEOPTION_SELECT) {
+						if (changeValueBy > 0) {
+							option.displayedValue++;
+							if (option.displayedValue >= option.numRightTexts)
+								option.displayedValue = 0;
+						} else {
+							option.displayedValue--;
+							if (option.displayedValue < 0)
+								option.displayedValue = option.numRightTexts - 1;
+						}
+						if (!option.onlyApplyOnEnter) {
+							option.changeFunc(option.displayedValue);
+							*option.value = option.displayedValue;
+						}
+					} else if (option.type == FEOPTION_DYNAMIC) {
+						option.buttonPressFunc(changeValueBy > 0 ? FEOPTION_ACTION_RIGHT : FEOPTION_ACTION_LEFT);
+					}
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
+				}
+				else {
+					debug("C- screen:%d option:%d - totalCo: %d, coId: %d, coScreen:%d, coOption:%d\n", m_nCurrScreen, m_nCurrOption, numCustomFrontendOptions, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, option.screen, option.screenOptionOrder);
+					assert(0 && "Custom frontend options are borked");
+				}
+
+				break;
+#endif
 		}
 		ProcessOnOffMenuOptions();
 		if (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
@@ -4890,13 +5016,6 @@ CMenuManager::ProcessOnOffMenuOptions()
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 		SaveSettings();
 		break;
-#ifdef FREE_CAM
-	case MENUACTION_FREECAM:
-		TheCamera.bFreeCam = !TheCamera.bFreeCam;
-		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
-		SaveSettings();
-		break;
-#endif
 	}
 }
 
@@ -5010,7 +5129,7 @@ CMenuManager::ProcessFileActions()
 	}
 }
 
-// --MIAMI: Done except DxInput things, are they even needed?
+// --MIAMI: Done
 void
 CMenuManager::SwitchMenuOnAndOff()
 {
@@ -5036,7 +5155,12 @@ CMenuManager::SwitchMenuOnAndOff()
 				m_bMenuActive = !m_bMenuActive;
 
 			if (m_bMenuActive) {
-				// TODO(Miami): DxInput??
+#if defined RW_D3D9 || defined RWLIBS
+				if (_InputMouseNeedsExclusive()) {
+					_InputShutdownMouse();
+					_InputInitialiseMouse(false);
+				}
+#endif
 
 				Initialise();
 				LoadAllTextures();
@@ -5049,8 +5173,12 @@ CMenuManager::SwitchMenuOnAndOff()
 				DoRWStuffEndOfFrame();
 				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
 				DoRWStuffEndOfFrame();
-
-				// TODO(Miami): DxInput??
+#if defined RW_D3D9 || defined RWLIBS
+				if (_InputMouseNeedsExclusive()) {
+					_InputShutdownMouse();
+					_InputInitialiseMouse(true);
+				}
+#endif
 
 #ifdef PS2_LIKE_MENU
 				bottomBarActive = false;
@@ -5095,7 +5223,12 @@ CMenuManager::SwitchMenuOnAndOff()
 		m_bMenuActive = true;
 		m_OnlySaveMenu = true;
 
-		// TODO(Miami): DxInput??
+#if defined RW_D3D9 || defined RWLIBS
+		if (_InputMouseNeedsExclusive()) {
+			_InputShutdownMouse();
+			_InputInitialiseMouse(false);
+		}
+#endif
 
 		Initialise();
 		LoadAllTextures();
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index 327bf6fa..83d86d5b 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -265,17 +265,9 @@ enum eMenuAction
 	MENUACTION_DYNAMICACOUSTIC,
 	MENUACTION_MOUSESTEER,
 	MENUACTION_UNK110,
-#ifdef MORE_LANGUAGES
-	MENUACTION_LANG_PL,
-	MENUACTION_LANG_RUS,
-	MENUACTION_LANG_JAP,
-#endif
 #ifdef IMPROVED_VIDEOMODE
 	MENUACTION_SCREENMODE,
 #endif
-#ifdef FREE_CAM
-	MENUACTION_FREECAM,
-#endif
 #ifdef LEGACY_MENU_OPTIONS
 	MENUACTION_CTRLVIBRATION,
 	MENUACTION_CTRLCONFIG,
@@ -547,7 +539,7 @@ public:
 	int32 m_nMouseOldPosY;
 	int32 m_nHoverOption;
 	bool m_bShowMouse;
-	int32 m_nPrevOption;
+	int32 m_nOptionMouseHovering;
 	bool m_bStartWaitingForKeyBind;
 	bool m_bWaitingForNewKeyBind;
 	bool m_bKeyChangeNotProcessed;
@@ -664,6 +656,7 @@ public:
 	void ScrollDownListByOne();
 	void PageUpList(bool);
 	void PageDownList(bool);
+	int8 GetPreviousPageOption();
 	
 	// uint8 GetNumberOfMenuOptions();
 };
@@ -673,6 +666,6 @@ VALIDATE_SIZE(CMenuManager, 0x688);
 #endif
 
 extern CMenuManager FrontEndMenuManager;
-
+extern CMenuScreen aScreens[];
 
 #endif
\ No newline at end of file
diff --git a/src/core/General.h b/src/core/General.h
index dbf169e9..7ab444a4 100644
--- a/src/core/General.h
+++ b/src/core/General.h
@@ -108,7 +108,7 @@ public:
 		if (angle >= TWOPI)
 			angle -= TWOPI;
 
-		return (int)floorf(angle / DEGTORAD(45.0f));
+		return (int)Floor(angle / DEGTORAD(45.0f));
 	}
 
 	// Unlike usual string comparison functions, these don't care about greater or lesser
diff --git a/src/core/MenuScreens.h b/src/core/MenuScreens.cpp
index 3f9631c8..6fbf597b 100644
--- a/src/core/MenuScreens.h
+++ b/src/core/MenuScreens.cpp
@@ -1,6 +1,8 @@
-#pragma once
+#include "common.h"
+#include "Frontend.h"
+#ifdef PC_MENU
 
-// --MIAMI: Done except commented things
+// If you want to add new options, please don't do that here and see CustomFrontendOptionsPopulate in re3.cpp.
 
 CMenuScreen aScreens[] = {
 	// MENUPAGE_STATS = 0
@@ -341,3 +343,5 @@ CMenuScreen aScreens[] = {
 	},
 #endif
 };
+
+#endif
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 97cc1786..83930c41 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -39,6 +39,7 @@
 #include "General.h"
 #include "Fluff.h"
 #include "Gangs.h"
+#include "platform.h"
 
 #ifdef GTA_PS2
 #include "eetypes.h"
@@ -671,7 +672,7 @@ CMouseControllerState CMousePointerStateHelper::GetMouseSetUp()
 
 #if defined RW_D3D9 || defined RWLIBS
 	if ( PSGLOBAL(mouse) == nil )
-		_InputInitialiseMouse();
+		_InputInitialiseMouse(!FrontEndMenuManager.m_bMenuActive && _InputMouseNeedsExclusive());
 
 	if ( PSGLOBAL(mouse) != nil )
 	{
@@ -725,7 +726,7 @@ void CPad::UpdateMouse()
 	{
 #if defined RW_D3D9 || defined RWLIBS
 		if ( PSGLOBAL(mouse) == nil )
-			_InputInitialiseMouse();
+			_InputInitialiseMouse(!FrontEndMenuManager.m_bMenuActive && _InputMouseNeedsExclusive());
 
 		DIMOUSESTATE2 state;
 
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index c359793c..559a8cd6 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -778,8 +778,8 @@ void CRadar::DrawRadarMap()
 	DrawRadarMask();
 
 	// top left ist (0, 0)
-	int x = floorf((vec2DRadarOrigin.x - RADAR_MIN_X) / RADAR_TILE_SIZE);
-	int y = ceilf((RADAR_NUM_TILES - 1) - (vec2DRadarOrigin.y - RADAR_MIN_Y) / RADAR_TILE_SIZE);
+	int x = Floor((vec2DRadarOrigin.x - RADAR_MIN_X) / RADAR_TILE_SIZE);
+	int y = Ceil((RADAR_NUM_TILES - 1) - (vec2DRadarOrigin.y - RADAR_MIN_Y) / RADAR_TILE_SIZE);
 	StreamRadarSections(x, y);
 
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
@@ -1332,7 +1332,7 @@ void CRadar::Shutdown()
 
 void CRadar::StreamRadarSections(const CVector &posn)
 {
-	StreamRadarSections(floorf((2000.0f + posn.x) / 500.0f), ceilf(7.0f - (2000.0f + posn.y) / 500.0f));
+	StreamRadarSections(Floor((2000.0f + posn.x) / 500.0f), Ceil(7.0f - (2000.0f + posn.y) / 500.0f));
 }
 
 void CRadar::StreamRadarSections(int32 x, int32 y)
diff --git a/src/core/User.cpp b/src/core/User.cpp
index 56e37ac4..53196d03 100644
--- a/src/core/User.cpp
+++ b/src/core/User.cpp
@@ -74,6 +74,14 @@ CPlaceName::Display()
 	CHud::SetZoneName(text);
 }
 
+void
+CPlaceName::ProcessAfterFrontEndShutDown(void)
+{
+	CHud::m_pLastZoneName = nil;
+	CHud::m_ZoneState = 0;
+	m_nAdditionalTimer = 250;
+}
+
 CCurrentVehicle::CCurrentVehicle()
 {
 	Init();
diff --git a/src/core/User.h b/src/core/User.h
index 153ef57b..dd53a40a 100644
--- a/src/core/User.h
+++ b/src/core/User.h
@@ -16,6 +16,7 @@ public:
 	void Init();
 	void Process();
 	void Display();
+	void ProcessAfterFrontEndShutDown();
 };
 
 class CCurrentVehicle
diff --git a/src/core/Zones.cpp b/src/core/Zones.cpp
index 87e85da5..3095b36d 100644
--- a/src/core/Zones.cpp
+++ b/src/core/Zones.cpp
@@ -104,7 +104,7 @@ CTheZones::Init(void)
 	NavigationZoneArray[0].maxy =  2000.0f;
 	NavigationZoneArray[0].maxz =  500.0f;
 	NavigationZoneArray[0].level = LEVEL_GENERIC;
-	NavigationZoneArray[0].type = ZONE_NAVIG;
+	NavigationZoneArray[0].type = ZONE_DEFAULT;
 
 	m_CurrLevel = LEVEL_GENERIC;
 
diff --git a/src/core/config.h b/src/core/config.h
index 14489491..4110b131 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -285,7 +285,6 @@ enum Config {
 #define VC_PED_PORTS			// various ports from VC's CPed, mostly subtle
 // #define NEW_WALK_AROUND_ALGORITHM	// to make walking around vehicles/objects less awkward
 #define CANCELLABLE_CAR_ENTER
-//#define PEDS_REPORT_CRIMES_ON_PHONE
 
 // Camera
 #define IMPROVED_CAMERA		// Better Debug cam, and maybe more in the future
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 63ea03fc..4c88c485 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -620,6 +620,23 @@ CEntity::PruneReferences(void)
 	}
 }
 
+// Clean up the reference from *pent -> 'this'
+void
+CEntity::CleanUpOldReference(CEntity **pent)
+{
+	CReference* ref, ** lastnextp;
+	lastnextp = &m_pFirstReference;
+	for (ref = m_pFirstReference; ref; ref = ref->next) {
+		if (ref->pentity == pent) {
+			*lastnextp = ref->next;
+			ref->next = CReferences::pEmptyList;
+			CReferences::pEmptyList = ref;
+			break;
+		}
+		lastnextp = &ref->next;
+	}
+}
+
 void
 CEntity::UpdateRpHAnim(void)
 {
diff --git a/src/entities/Entity.h b/src/entities/Entity.h
index 7570110b..fd01b6f8 100644
--- a/src/entities/Entity.h
+++ b/src/entities/Entity.h
@@ -168,6 +168,7 @@ public:
 	void RegisterReference(CEntity **pent);
 	void ResolveReferences(void);
 	void PruneReferences(void);
+	void CleanUpOldReference(CEntity **pent);
 
 #ifdef PED_SKIN
 	void UpdateRpHAnim(void);
diff --git a/src/math/maths.h b/src/math/maths.h
index 51b0ef10..8d68bf64 100644
--- a/src/math/maths.h
+++ b/src/math/maths.h
@@ -15,3 +15,5 @@ inline float Sqrt(float x) { return sqrtf(x); }
 inline float RecipSqrt(float x, float y) { return x/Sqrt(y); }
 inline float RecipSqrt(float x) { return RecipSqrt(1.0f, x); }
 inline float Pow(float x, float y) { return powf(x, y); }
+inline float Floor(float x) { return floorf(x); }
+inline float Ceil(float x) { return ceilf(x); }
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 557aafa3..7db2124d 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -428,6 +428,9 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	bIgnoreThreatsBehindObjects = false;
 
 	bNeverEverTargetThisPed = false;
+	bCrouchWhenScared = false;
+	bKnockedOffBike = false;
+	b158_8 = false;
 	b158_10 = false;
 	bBoughtIceCream = false;
 	b158_40 = false;
@@ -2315,6 +2318,7 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 
 }
 
+// --MIAMI: Done
 static void
 particleProduceFootDust(CPed *ped, CVector const &pos, float size, int times)
 {
@@ -2324,10 +2328,15 @@ particleProduceFootDust(CPed *ped, CVector const &pos, float size, int times)
 		case SURFACE_GRAVEL:
 		case SURFACE_PAVEMENT:
 		case SURFACE_SAND:
+		case SURFACE_SAND_BEACH:
+		case SURFACE_CONCRETE_BEACH:
 			for (int i = 0; i < times; ++i) {
 				CVector adjustedPos = pos;
 				adjustedPos.x += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f);
 				adjustedPos.y += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f);
+				// ??
+				CGeneral::GetRandomNumber();
+				CGeneral::GetRandomNumber();
 				CParticle::AddParticle(PARTICLE_PEDFOOT_DUST, adjustedPos, CVector(0.0f, 0.0f, 0.0f), nil, size, CRGBA(0, 0, 0, 0), 0, 0, 0, 0);
 			}
 			break;
@@ -2336,10 +2345,10 @@ particleProduceFootDust(CPed *ped, CVector const &pos, float size, int times)
 	}
 }
 
+// --MIAMI: Done
 static void
 particleProduceFootSplash(CPed *ped, CVector const &pos, float size, int times)
 {
-#ifdef PC_PARTICLE
 	for (int i = 0; i < times; i++) {
 		CVector adjustedPos = pos;
 		adjustedPos.x += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f);
@@ -2348,21 +2357,20 @@ particleProduceFootSplash(CPed *ped, CVector const &pos, float size, int times)
 		CVector direction = ped->GetForward() * -0.05f;
 		CParticle::AddParticle(PARTICLE_RAIN_SPLASHUP, adjustedPos, direction, nil, size, CRGBA(32, 32, 32, 32), 0, 0, CGeneral::GetRandomNumber() & 1, 200);
 	}
-#else
-	for ( int32 i = 0; i < times; i++ )
-	{
-		CVector adjustedPos = pos;
-		adjustedPos.x += CGeneral::GetRandomNumberInRange(-0.2f, 0.2f);
-		adjustedPos.y += CGeneral::GetRandomNumberInRange(-0.2f, 0.2f);
-	
-		CParticle::AddParticle(PARTICLE_RAIN_SPLASHUP, adjustedPos, CVector(0.0f, 0.0f, 0.0f), nil, size, CRGBA(0, 0, 0, 0), 0, 0, CGeneral::GetRandomNumber() & 1, 200);
-	}
-#endif
 }
 
+// --MIAMI: Done
 void
 CPed::PlayFootSteps(void)
 {
+	CAnimBlendAssociation *assoc = RpAnimBlendClumpGetFirstAssociation(GetClump());
+	CAnimBlendAssociation *walkRunAssoc = nil;
+	float walkRunAssocBlend = 0.0f, idleAssocBlend = 0.0f;
+	bool isSkater = m_pedStats == CPedStats::ms_apPedStats[PEDSTAT_SKATER];
+
+	CVector footPosL(0.0f, 0.0f, 0.0f), footPosR(0.0f, 0.0f, 0.0f);
+	bool footPosLok = false, footPosRok = false;
+
 	if (bDoBloodyFootprints) {
 		if (m_bloodyFootprintCountOrDeathTime > 0 && m_bloodyFootprintCountOrDeathTime < 300) {
 			m_bloodyFootprintCountOrDeathTime--;
@@ -2375,10 +2383,6 @@ CPed::PlayFootSteps(void)
 	if (!bIsStanding)
 		return;
 
-	CAnimBlendAssociation *assoc = RpAnimBlendClumpGetFirstAssociation(GetClump());
-	CAnimBlendAssociation *walkRunAssoc = nil;
-	float walkRunAssocBlend = 0.0f, idleAssocBlend = 0.0f;
-
 	for (; assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
 		if (assoc->flags & ASSOC_WALK) {
 			walkRunAssoc = assoc;
@@ -2388,96 +2392,200 @@ CPed::PlayFootSteps(void)
 		}
 	}
 
-#ifdef GTA_PS2_STUFF
-	CAnimBlendAssociation *runStopAsoc = NULL;
-	
-	if ( IsPlayer() )
-	{	
-		runStopAsoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_RUN_STOP);
-		
-		if ( runStopAsoc == NULL )
-			runStopAsoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_RUN_STOP_R);
-	}
-	
-	if ( runStopAsoc != NULL && runStopAsoc->blendAmount > 0.1f )
-	{
-		{
-			CVector pos(0.0f, 0.0f, 0.0f);
-			TransformToNode(pos, PED_FOOTL);
-				
-			pos.z -= 0.1f;
-			pos += GetForward()*0.2f;
-			particleProduceFootDust(this, pos, 0.02f, 1);
-		}
-
-		{
-			CVector pos(0.0f, 0.0f, 0.0f);
-			TransformToNode(pos, PED_FOOTR);
-				
-			pos.z -= 0.1f;
-			pos += GetForward()*0.2f;
-			particleProduceFootDust(this, pos, 0.02f, 1);
-		}
-	}
-#endif
-	
-
 	if (walkRunAssoc && walkRunAssocBlend > 0.5f && idleAssocBlend < 1.0f) {
-		float stepStart = 1 / 15.0f;
+
+		float stepStart = 1.f / 15.f;
 		float stepEnd = walkRunAssoc->hierarchy->totalLength / 2.0f + stepStart;
 		float currentTime = walkRunAssoc->currentTime;
-		int stepPart = 0;
 
-		if (currentTime >= stepStart && currentTime - walkRunAssoc->timeStep < stepStart)
-			stepPart = 1;
-		else if (currentTime >= stepEnd && currentTime - walkRunAssoc->timeStep < stepEnd)
-			stepPart = 2;
+		if (isSkater) {
+			// both are unused
+			static float stepStartSection = 1.0f;
+			static float animSections = 15.f;
+
+			float moveStart, soundVolume, skateTime;
+			if (walkRunAssoc->animId == ANIM_WALK) {
+				moveStart = 0.0f;
+				skateTime = 8.f / 15.f;
+			} else {
+				moveStart = 0.0f;
+				skateTime = 5.f / 15.f;
+			}
+			switch (CSurfaceTable::GetAdhesionGroup(m_nSurfaceTouched)) {
+				case ADHESIVE_LOOSE:
+					if (CGeneral::GetRandomNumber() % 128) {
+						m_vecAnimMoveDelta *= 0.5f;
+					} else {
+						SetFall(0, ANIM_KO_SKID_BACK, false);
+					}
+					soundVolume = 0.5f;
+					break;
+				case ADHESIVE_SAND:
+					if (CGeneral::GetRandomNumber() % 64) {
+						m_vecAnimMoveDelta *= 0.2f;
+					} else {
+						SetFall(0, ANIM_KO_SKID_BACK, false);
+					}
+					soundVolume = 0.2f;
+					break;
+				case ADHESIVE_WET:
+					m_vecAnimMoveDelta *= 0.3f;
+					soundVolume = 0.2f;
+					break;
+				default:
+					soundVolume = 1.f;
+					break;
+			}
+			if (soundVolume > 0.2f && currentTime > moveStart && currentTime - walkRunAssoc->timeStep <= moveStart) {
+				DMAudio.PlayOneShot(m_audioEntityId, SOUND_SKATING, ((int)(127.f * soundVolume) | (walkRunAssoc->animId << 8)));
+			} else if (soundVolume > 0.2f) {
+				if (currentTime > skateTime && currentTime - walkRunAssoc->timeStep <= skateTime) {
+					DMAudio.PlayOneShot(m_audioEntityId, SOUND_SKATING, ((int)(127.f * soundVolume) | (walkRunAssoc->animId << 8)));
+				}
+			}
+
+		} else {
+			int stepPart = 0;
+			
+			// This section is shortened/optimized for sanity.
+
+			if (currentTime >= stepStart && currentTime - walkRunAssoc->timeStep < stepStart)
+				stepPart = 1;
+			else if (currentTime >= stepEnd && currentTime - walkRunAssoc->timeStep < stepEnd)
+				stepPart = 2;
+
+			if (stepPart != 0) {
+				CVector adjustedFootPos;
+				if (stepPart == 1) {
+					DMAudio.PlayOneShot(m_audioEntityId, SOUND_STEP_START, 1.0f);
+					TransformToNode(footPosL, PED_FOOTL);
+					footPosLok = true;
+					adjustedFootPos = footPosL;
+				} else {
+					DMAudio.PlayOneShot(m_audioEntityId, SOUND_STEP_END, 1.0f);
+					TransformToNode(footPosR, PED_FOOTR);
+					footPosRok = true;
+					adjustedFootPos = footPosR;
+				}
+
+				CVector forward = GetForward();
+
+				adjustedFootPos.z -= 0.1f;
+				adjustedFootPos += 0.2f * forward;
+
+				if (bDoBloodyFootprints) {
+					CVector2D top(forward * 0.26f);
+					CVector2D right(GetRight() * (stepPart == 1 ? 0.14f : 0.1f));
+
+					CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &adjustedFootPos,
+						top.x, top.y,
+						right.x, right.y,
+						255, 255, 0, 0, 4.0f, 3000.0f, 1.0f);
+
+					if (m_bloodyFootprintCountOrDeathTime <= 20) {
+						m_bloodyFootprintCountOrDeathTime = 0;
+						bDoBloodyFootprints = false;
+					} else {
+						m_bloodyFootprintCountOrDeathTime -= 20;
+					}
+				}
+				if (m_nSurfaceTouched == SURFACE_SAND || m_nSurfaceTouched == SURFACE_SAND_BEACH) {
+					CVector2D top(forward * -0.26f);
+					CVector2D right(GetRight() * (stepPart == 1 ? 0.1f : 0.14f));
+
+					CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &adjustedFootPos,
+						top.x, top.y,
+						right.x, right.y,
+						120, 250, 250, 50, 4.0f, 5000.0f, 1.0f);
+				}
+				if (CWeather::Rain <= 0.1f || CCullZones::CamNoRain() || CCullZones::PlayerNoRain()) {
+					if (IsPlayer())
+						particleProduceFootDust(this, adjustedFootPos, 0.0f, 4);
+
+				} else if (stepPart == 2) {
+					particleProduceFootSplash(this, adjustedFootPos, 0.15f, 4);
+				}
+			}
+		}
+	}
+
+	if (IsPlayer() && !walkRunAssoc && bIsLanding) {
+		if (!footPosLok)
+			TransformToNode(footPosL, PED_FOOTL);
 
-		if (stepPart != 0) {
-			DMAudio.PlayOneShot(m_audioEntityId, stepPart == 1 ? SOUND_STEP_START : SOUND_STEP_END, 1.0f);
-			CVector footPos(0.0f, 0.0f, 0.0f);
-			TransformToNode(footPos, stepPart == 1 ? PED_FOOTL : PED_FOOTR);
+		CVector forward = GetForward();
 
-			CVector forward = GetForward();
+		CVector adjustedFootPosL = footPosL;
+		adjustedFootPosL.z -= 0.1f;
+		adjustedFootPosL += 0.2f * forward;
+		if (bDoBloodyFootprints) {
+			CVector2D top(forward * 0.26f);
+			CVector2D right(GetRight() * 0.14f);
 
-			footPos.z -= 0.1f;
-			footPos += 0.2f * forward;
+			CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &adjustedFootPosL,
+				top.x, top.y,
+				right.x, right.y,
+				255, 255, 0, 0, 4.0f, 3000.0f, 1.0f);
 
-			if (bDoBloodyFootprints) {
-				CVector2D top(forward * 0.26f);
+			if (m_bloodyFootprintCountOrDeathTime <= 20) {
+				m_bloodyFootprintCountOrDeathTime = 0;
+				bDoBloodyFootprints = false;
+			}
+			else {
+				m_bloodyFootprintCountOrDeathTime -= 20;
+			}
+		}
+		if (!isSkater) {
+			if (m_nSurfaceTouched == SURFACE_SAND || m_nSurfaceTouched == SURFACE_SAND_BEACH) {
+				CVector2D top(forward * -0.26f);
 				CVector2D right(GetRight() * 0.14f);
 
-				CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &footPos,
+				CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &adjustedFootPosL,
 					top.x, top.y,
 					right.x, right.y,
-					255, 255, 0, 0, 4.0f, 3000.0f, 1.0f);
-
-				if (m_bloodyFootprintCountOrDeathTime <= 20) {
-					m_bloodyFootprintCountOrDeathTime = 0;
-					bDoBloodyFootprints = false;
-				} else {
-					m_bloodyFootprintCountOrDeathTime -= 20;
-				}
+					120, 250, 250, 50, 4.0f, 5000.0f, 1.0f);
 			}
-			if (CWeather::Rain <= 0.1f || CCullZones::CamNoRain() || CCullZones::PlayerNoRain()) {
-				if(IsPlayer())
-					particleProduceFootDust(this, footPos, 0.0f, 4);
+		}
+		if(!footPosRok)
+			TransformToNode(footPosR, PED_FOOTR);
+
+		CVector adjustedFootPosR = footPosR;
+		adjustedFootPosR.z -= 0.1f;
+		adjustedFootPosR += 0.2f * forward;
+
+		if (bDoBloodyFootprints) {
+			CVector2D top(forward * 0.26f);
+			CVector2D right(GetRight() * 0.1f);
+
+			CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &adjustedFootPosR,
+				top.x, top.y,
+				right.x, right.y,
+				255, 255, 0, 0, 4.0f, 3000.0f, 1.0f);
+
+			if (m_bloodyFootprintCountOrDeathTime <= 20) {
+				m_bloodyFootprintCountOrDeathTime = 0;
+				bDoBloodyFootprints = false;
+			} else {
+				m_bloodyFootprintCountOrDeathTime -= 20;
 			}
-#ifdef PC_PARTICLE
-			else if(stepPart == 2)
-#else
-			else
-#endif
-			{
-				particleProduceFootSplash(this, footPos, 0.15f, 4);
+		}
+		if (!isSkater) {
+			if (m_nSurfaceTouched == SURFACE_SAND || m_nSurfaceTouched == SURFACE_SAND_BEACH) {
+				CVector2D top(forward * -0.26f);
+				CVector2D right(GetRight() * 0.14f);
+
+				CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &adjustedFootPosR,
+					top.x, top.y,
+					right.x, right.y,
+					120, 250, 250, 50, 4.0f, 5000.0f, 1.0f);
 			}
 		}
 	}
 
 	if (m_nSurfaceTouched == SURFACE_WATER) {
+		CRGBA rubberSmokeColor(255, 255, 255, 196);
 		float pedSpeed = CVector2D(m_vecMoveSpeed).Magnitude();
 		if (pedSpeed > 0.03f && CTimer::GetFrameCounter() % 2 == 0 && pedSpeed > 0.13f) {
-#ifdef PC_PARTICLE
 			float particleSize = pedSpeed * 2.0f;
 
 			if (particleSize < 0.25f)
@@ -2489,19 +2597,23 @@ CPed::PlayFootSteps(void)
 			CVector particlePos = GetPosition() + GetForward() * 0.3f;
 			particlePos.z -= 1.2f;
 
-			CVector particleDir = m_vecMoveSpeed * 0.75f;
+			CVector particleDir = m_vecMoveSpeed * -0.75f;
 
 			particleDir.z = CGeneral::GetRandomNumberInRange(0.01f, 0.03f);
-			CParticle::AddParticle(PARTICLE_PED_SPLASH, particlePos, particleDir, nil, 0.8f * particleSize, CRGBA(155,155,185,128), 0, 0, 0, 0);
+			CParticle::AddParticle(PARTICLE_CAR_SPLASH, particlePos, particleDir, nil, 0.5f * particleSize, CRGBA(0,0,0,0), 0, 0, 0, 0);
+			CParticle::AddParticle(PARTICLE_RUBBER_SMOKE, particlePos, particleDir, nil, particleSize, rubberSmokeColor, 0, 0, 0, 0);
+		}
 
-			particleDir.z = CGeneral::GetRandomNumberInRange(0.03f, 0.05f);
-			CParticle::AddParticle(PARTICLE_RUBBER_SMOKE, particlePos, particleDir, nil, particleSize, CRGBA(255,255,255,255), 0, 0, 0, 0);
-#else
-			CVector particlePos = (GetPosition() - 0.3f * GetUp()) + GetForward()*0.3f;
-			CVector particleDir = m_vecMoveSpeed * 0.45f;
-			particleDir.z = CGeneral::GetRandomNumberInRange(0.03f, 0.05f);
-			CParticle::AddParticle(PARTICLE_PED_SPLASH, particlePos-CVector(0.0f, 0.0f, 1.2f), particleDir, nil, 0.0f, CRGBA(155, 185, 155, 255));
-#endif
+		if (m_nPedState == PED_JUMP) {
+			CVector particlePos = GetPosition();
+			particlePos.z -= 0.1f;
+
+			CVector particleDir(0.0f, 0.075f, 0.0f);
+			CParticle::AddParticle(PARTICLE_CAR_SPLASH, particlePos, particleDir, nil, 0.005f, CRGBA(0, 0, 0, 0), 0, 0, 0, 0);
+			particleDir.x += CGeneral::GetRandomNumberInRange(-0.05f, 0.05f);
+			particleDir.y += CGeneral::GetRandomNumberInRange(-0.05f, 0.05f);
+			particleDir.z -= CGeneral::GetRandomNumberInRange(0.025f, 0.05f);
+			CParticle::AddParticle(PARTICLE_RUBBER_SMOKE, particlePos, particleDir, nil, 0.5f, rubberSmokeColor, 0, 0, 0, 0);
 		}
 	}
 }
@@ -3186,13 +3298,16 @@ CPed::SetObjective(eObjective newObj, void *entity)
 			m_pNextPathNode = nil;
 			bUsePedNodeSeek = false;
 
-			// TODO(Miami): Clean up old references
+			if (m_pedInObjective)
+				m_pedInObjective->CleanUpOldReference((CEntity**)&m_pedInObjective);
+			if (m_pLookTarget)
+				m_pLookTarget->CleanUpOldReference(&m_pLookTarget);
 			
-			// m_pLookTarget = (CEntity*)entity; // duplicate
+			m_pLookTarget = (CEntity*)entity;
 			m_pedInObjective = (CPed*)entity;
 			m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
 			m_pedInObjective->RegisterReference((CEntity**)&m_pedInObjective);
-			m_pLookTarget = (CEntity*)entity;
+			// m_pLookTarget = (CEntity*)entity; // duplicate
 			m_pLookTarget->RegisterReference((CEntity**)&m_pLookTarget);
 			break;
 		case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
@@ -3201,10 +3316,11 @@ CPed::SetObjective(eObjective newObj, void *entity)
 		case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
 		case OBJECTIVE_HASSLE_CHAR:
 		case OBJECTIVE_GUARD_ATTACK:
-			// TODO(Miami): Clean up old references
 
-			m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
+			if (m_pedInObjective)
+				m_pedInObjective->CleanUpOldReference((CEntity**)&m_pedInObjective);
 			m_pedInObjective = (CPed*)entity;
+			m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
 			m_pedInObjective->RegisterReference((CEntity**)&m_pedInObjective);
 			break;
 		case OBJECTIVE_FOLLOW_CHAR_IN_FORMATION:
@@ -3229,8 +3345,8 @@ CPed::SetObjective(eObjective newObj, void *entity)
 
 			break;
 		case OBJECTIVE_DESTROY_OBJECT:
-			// TODO(Miami): Clean up old references
-
+			if (m_pPointGunAt)
+				m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
 			m_pPointGunAt = (CPed*)entity;
 			if (entity)
 				((CEntity*)entity)->RegisterReference((CEntity**) &m_pPointGunAt);
@@ -3928,7 +4044,6 @@ CPed::ClearAll(void)
 	bIsPointingGunAt = false;
 	bRenderPedInCar = true;
 	bKnockedUpIntoAir = false;
-	bCrouchWhenScared = false;
 	bKnockedOffBike = false;
 	m_pCollidingEntity = nil;
 }
@@ -4921,14 +5036,18 @@ CPed::RestorePreviousState(void)
 	}
 }
 
-// TODO(Miami): Clean up old references
+// --MIAMI: Done
 void
 CPed::SetAimFlag(CEntity *to)
 {
 	bIsAimingGun = true;
 	bIsRestoringGun = false;
+	if (m_pLookTarget)
+		m_pLookTarget->CleanUpOldReference(&m_pLookTarget);
 	m_pLookTarget = to;
 	m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
+	if (m_pSeekTarget)
+		m_pSeekTarget->CleanUpOldReference(&m_pSeekTarget);
 	m_pSeekTarget = to;
 	m_pSeekTarget->RegisterReference((CEntity **) &m_pSeekTarget);
 	m_lookTimer = 0;
@@ -5294,7 +5413,8 @@ CPed::SetAttack(CEntity *victim)
 		return;
 	}
 
-	// TODO(Miami): Clean up old referene
+	if (m_pSeekTarget)
+		m_pSeekTarget->CleanUpOldReference(&m_pSeekTarget);
 	m_pSeekTarget = victim;
 	if (m_pSeekTarget)
 		m_pSeekTarget->RegisterReference((CEntity **) &m_pSeekTarget);
@@ -5939,9 +6059,9 @@ CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon)
 	if (victimPed) {
 		float adjustedAngleDiff = victimAngle - m_fRotationCur + DEGTORAD(30.0f);
 		if (adjustedAngleDiff < 0.0f)
-			adjustedAngleDiff = adjustedAngleDiff + TWOPI;
+			adjustedAngleDiff += TWOPI;
 
-		int16 dir = floorf(adjustedAngleDiff / DEGTORAD(60.0f));
+		int16 dir = Floor(adjustedAngleDiff / DEGTORAD(60.0f));
 
 		// Just focus on who we're fighting with, don't care peds on ground
 		if (numPedsWeCanReach < 2 || fightWithWeapon) {
@@ -6570,15 +6690,15 @@ CPed::PlayHitSound(CPed *hitTo)
 	uint16 soundId;
 
 	// And this is why second dimension is between 18 and 27.
-	if (hitTo->m_curFightMove <= FIGHTMOVE_GROUNDKICK || hitTo->m_curFightMove >= FIGHTMOVE_IDLE2NORM) {
+	if (hitTo->m_curFightMove > FIGHTMOVE_GROUNDKICK && hitTo->m_curFightMove < FIGHTMOVE_IDLE2NORM) {
+		soundId = hitSoundsByFightMoves[m_curFightMove - FIGHTMOVE_STDPUNCH][hitTo->m_curFightMove - FIGHTMOVE_HITFRONT];
 
+	} else {
 		if (hitTo->m_nPedState == PED_DEAD || hitTo->UseGroundColModel()) {	
 			soundId = hitSoundsByFightMoves[m_curFightMove - FIGHTMOVE_STDPUNCH][FIGHTMOVE_HITONFLOOR - FIGHTMOVE_HITFRONT];
 		} else {
 			soundId = hitSoundsByFightMoves[m_curFightMove - FIGHTMOVE_STDPUNCH][FIGHTMOVE_HITFRONT - FIGHTMOVE_HITFRONT];
 		}
-	} else {
-		soundId = hitSoundsByFightMoves[m_curFightMove - FIGHTMOVE_STDPUNCH][hitTo->m_curFightMove - FIGHTMOVE_HITFRONT];
 	}
 
 	if (soundId != NO_SND)
@@ -7754,6 +7874,9 @@ CPed::Fight(void)
 		case FIGHTMOVE_IDLE2NORM:
 			m_curFightMove = FIGHTMOVE_NULL;
 			RestorePreviousState();
+
+			// FIX: Uninitialized
+			currentAssoc = nil;
 			break;
 		case FIGHTMOVE_IDLE:
 			currentAssoc = nil;
@@ -8477,8 +8600,9 @@ CPed::Wait(void)
 			else if (m_nWaitState == WAITSTATE_PLAYANIM_TAXI) {
 				if (m_pedInObjective) {
 					if (m_objective == OBJECTIVE_GOTO_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT) {
-						
-						// VC also calls CleanUpOldReference here for old LookTarget.
+
+						if (m_pLookTarget)
+							m_pLookTarget->CleanUpOldReference(&m_pLookTarget);
 						m_pLookTarget = m_pedInObjective;
 						m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
 						TurnBody();
@@ -8955,7 +9079,7 @@ void
 CPed::FollowPath(void)
 {
 	m_pCurPathNode = m_pathNodesToGo[m_nCurPathNodeId];
-	if (m_pathNodeTimer != 0 && CTimer::GetTimeInMilliseconds() > m_pathNodeTimer) {
+	if (m_pathNodeTimer > 0 && CTimer::GetTimeInMilliseconds() > m_pathNodeTimer) {
 		RestorePreviousState();
 		ClearFollowPath();
 		m_pathNodeTimer = 0;
@@ -10872,7 +10996,8 @@ CPed::ProcessControl(void)
 								Say(SOUND_PED_TAXI_CALL);
 							}
 						} else {
-							// TODO(Miami): CleanUpOldReference
+							if (m_pLookTarget)
+								m_pLookTarget->CleanUpOldReference(&m_pLookTarget);
 
 							m_pLookTarget = m_pedInObjective;
 							m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
@@ -11260,7 +11385,7 @@ CPed::ProcessControl(void)
 				|| (!bIsStanding && !bWasStanding && m_nPedState == PED_FALL)
 #endif		
 			) {
-				if (m_nPedStateTimer <= 1000 && m_nPedStateTimer != 0) {
+				if (m_nPedStateTimer > 0 && m_nPedStateTimer <= 1000) {
 					forceDir = GetPosition() - m_vecHitLastPos;
 				} else {
 					m_nPedStateTimer = 0;
@@ -14097,356 +14222,29 @@ CPed::ProcessObjective(void)
 			}
 			case OBJECTIVE_KILL_CHAR_ON_FOOT:
 			{
-				bool killPlayerInNoPoliceZone = false;
 				if (m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT && InVehicle()) {
 					SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
 					break;
 				}
 
 				if (!m_pedInObjective || m_pedInObjective->DyingOrDead()) {
-					ClearLookFlag();
 					bObjectiveCompleted = true;
+					ClearLookFlag();
 					SetMoveAnim();
 					break;
 				}
-				if (m_pedInObjective->IsPlayer() && CCullZones::NoPolice())
-					killPlayerInNoPoliceZone = true;
-
-				if (!bNotAllowedToDuck || killPlayerInNoPoliceZone) {
-					if (m_nPedType == PEDTYPE_COP && !m_pedInObjective->GetWeapon()->IsTypeMelee() && !GetWeapon()->IsTypeMelee())
-						bNotAllowedToDuck = true;
-				} else {
-					if (!m_pedInObjective->bInVehicle) {
-						if (m_pedInObjective->GetWeapon()->IsTypeMelee() || GetWeapon()->IsTypeMelee()) {
-							bNotAllowedToDuck = false;
-							bCrouchWhenShooting = false;
-						} else if (DuckAndCover()) {
-							break;
-						}
-					} else {
-						bNotAllowedToDuck = false;
-						bCrouchWhenShooting = false;
-					}
-				}
-				if (m_leaveCarTimer > CTimer::GetTimeInMilliseconds() && !bKindaStayInSamePlace) {
-					SetMoveState(PEDMOVE_STILL);
-					break;
-				}
-				if (m_pedInObjective->IsPlayer()) {
-					CPlayerPed *player = FindPlayerPed();
-					if (m_nPedType == PEDTYPE_COP && player->m_pWanted->m_bIgnoredByCops
-						|| player->m_pWanted->m_bIgnoredByEveryone
-						|| m_pedInObjective->bIsInWater
-						|| m_pedInObjective->m_nPedState == PED_ARRESTED) {
-
-						if (m_nPedState != PED_ARREST_PLAYER)
-							SetIdle();
-
-						break;
-					}
-				}
-				CWeaponInfo *wepInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-				float wepRange = wepInfo->m_fRange;
-				float wepRangeAdjusted;
-				if (GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED) {
-					wepRangeAdjusted = wepRange / 3.0f;
-				} else {
-					if (m_nPedState == PED_FIGHT) {
-						if (!IsPlayer() && !(m_pedStats->m_flags & STAT_CAN_KICK))
-							wepRange = 2.0f;
-					} else {
-						wepRange = 1.3f;
-					}
-					wepRangeAdjusted = wepRange;
-				}
-				if (m_pedInObjective->m_getUpTimer > CTimer::GetTimeInMilliseconds() && wepRangeAdjusted < 2.5f) {
-					wepRangeAdjusted = 2.5f;
-				}
-				if (m_pedInObjective->IsPlayer() && m_nPedType != PEDTYPE_COP
-					&& CharCreatedBy != MISSION_CHAR && FindPlayerPed()->m_pWanted->m_CurrentCops) {
-					SetObjective(OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE);
-					break;
-				}
-				if (m_pedInObjective->m_fHealth <= 0.0f) {
-					bObjectiveCompleted = true;
-					bScriptObjectiveCompleted = true;
-					SetMoveAnim();
-					break;
-				}
-				float distWithTargetSc = distWithTarget.Magnitude();
-				if (m_pedInObjective->bInVehicle && m_pedInObjective->m_nPedState != PED_DRAG_FROM_CAR) {
-					CVehicle *vehOfTarget = m_pedInObjective->m_pMyVehicle;
-					if (vehOfTarget->bIsInWater || vehOfTarget->GetStatus() == STATUS_PLAYER_DISABLED
-						|| m_pedInObjective->IsPlayer() && CPad::GetPad(0)->ArePlayerControlsDisabled()) {
-						SetIdle();
-						return;
-					}
-					SetLookFlag(vehOfTarget, false);
-					if (m_nPedState != PED_CARJACK) {
-						if (m_pedInObjective->m_nPedState != PED_ARRESTED) {
-							if (m_attackTimer < CTimer::GetTimeInMilliseconds() && wepInfo->m_eWeaponFire != WEAPON_FIRE_MELEE
-								&& distWithTargetSc < wepRange && distWithTargetSc > 3.0f) {
-
-								// I hope so
-								CVector ourHead = GetMatrix() * CVector(0.5f, 0.0f, 0.6f);
-								CVector maxShotPos = vehOfTarget->GetPosition() - ourHead;
-								maxShotPos.Normalise();
-								maxShotPos = maxShotPos * wepInfo->m_fRange + ourHead;
-
-								CWorld::bIncludeDeadPeds = true;
-								CColPoint foundCol;
-								CEntity *foundEnt;
-								CWorld::ProcessLineOfSight(ourHead, maxShotPos, foundCol, foundEnt,
-									true, true, true, true, false, true, false);
-								CWorld::bIncludeDeadPeds = false;
-								if (foundEnt == vehOfTarget) {
-									SetAttack(vehOfTarget);
-									m_pPointGunAt = vehOfTarget;
-									if (vehOfTarget)
-										vehOfTarget->RegisterReference((CEntity **) &m_pPointGunAt);
-
-									SetShootTimer(CGeneral::GetRandomNumberInRange(500, 2000));
-									if (distWithTargetSc <= m_distanceToCountSeekDone) {
-										SetAttackTimer(CGeneral::GetRandomNumberInRange(200, 500));
-										SetMoveState(PEDMOVE_STILL);
-									} else {
-										SetAttackTimer(CGeneral::GetRandomNumberInRange(2000, 5000));
-									}
-								}
-							}
-							else if (m_nPedState != PED_ATTACK && !bKindaStayInSamePlace && !killPlayerInNoPoliceZone) {
-								if (vehOfTarget) {
-									if (m_nPedType == PEDTYPE_COP || vehOfTarget->bIsBus) {
-										GoToNearestDoor(vehOfTarget);
-									} else {
-										m_vehEnterType = 0;
-										if (m_pedInObjective == vehOfTarget->pDriver || vehOfTarget->bIsBus) {
-											m_vehEnterType = CAR_DOOR_LF;
-										} else if (m_pedInObjective == vehOfTarget->pPassengers[0]) {
-											m_vehEnterType = CAR_DOOR_RF;
-										} else if (m_pedInObjective == vehOfTarget->pPassengers[1]) {
-											m_vehEnterType = CAR_DOOR_LR;
-										} else if (m_pedInObjective == vehOfTarget->pPassengers[2]) {
-											m_vehEnterType = CAR_DOOR_RR;
-										}
-										// Unused
-										// GetPositionToOpenCarDoor(vehOfTarget, m_vehEnterType);
-										SetSeekCar(vehOfTarget, m_vehEnterType);
-										SetMoveState(PEDMOVE_RUN);
-									}
-								}
-							}
-						}
-					}
-					SetMoveAnim();
-					break;
-				}
-				if (m_nMoveState == PEDMOVE_STILL && IsPedInControl()) {
-					SetLookFlag(m_pedInObjective, false);
-					TurnBody();
-				}
-				if (m_nPedType == PEDTYPE_COP && distWithTargetSc < 1.5f && m_pedInObjective->IsPlayer()) {
-					if (m_pedInObjective->m_getUpTimer > CTimer::GetTimeInMilliseconds()
-						|| m_pedInObjective->m_nPedState == PED_DRAG_FROM_CAR) {
+				if (m_pedInObjective) {
+					int status;
+					if (GetWeapon()->IsTypeMelee())
+						status = KillCharOnFootMelee(carOrOurPos, targetCarOrHisPos, distWithTarget);
+					else
+						status = KillCharOnFootArmed(carOrOurPos, targetCarOrHisPos, distWithTarget);
 
-						((CCopPed*)this)->SetArrestPlayer(m_pedInObjective);
+					if (status == WATCH_UNTIL_HE_DISAPPEARS)
 						return;
-					}
-				}
-				if (!bKindaStayInSamePlace && !bStopAndShoot && m_nPedState != PED_ATTACK && !killPlayerInNoPoliceZone) {
-					if (distWithTargetSc > wepRange
-						|| m_pedInObjective->m_getUpTimer > CTimer::GetTimeInMilliseconds()
-						|| m_pedInObjective->m_nPedState == PED_ARRESTED
-						|| m_pedInObjective->EnteringCar() && distWithTargetSc < 3.0f
-						|| distWithTargetSc > m_distanceToCountSeekDone && !CanSeeEntity(m_pedInObjective)) {
-
-						if (m_pedInObjective->EnteringCar())
-							wepRangeAdjusted = 2.0f;
-
-						if (bUsePedNodeSeek) {
-							CVector bestCoords(0.0f, 0.0f, 0.0f);
-							m_vecSeekPos = m_pedInObjective->GetPosition();
-
-							if (!m_pNextPathNode)
-								FindBestCoordsFromNodes(m_vecSeekPos, &bestCoords);
-
-							if (m_pNextPathNode)
-								m_vecSeekPos = m_pNextPathNode->GetPosition();
-
-							SetSeek(m_vecSeekPos, m_distanceToCountSeekDone);
-						} else {
-							SetSeek(m_pedInObjective, wepRangeAdjusted);
-						}
-						bCrouchWhenShooting = false;
-						if (m_pedInObjective->m_pCurrentPhysSurface && distWithTargetSc < 5.0f) {
-							if (wepRange <= 5.0f) {
-								if (m_pedInObjective->IsPlayer()
-									&& FindPlayerPed()->m_bSpeedTimerFlag
-									&& (IsGangMember() || m_nPedType == PEDTYPE_COP)
-									&& GetWeapon()->m_eWeaponType == WEAPONTYPE_UNARMED) {
-									GiveWeapon(WEAPONTYPE_COLT45, 1000);
-									SetCurrentWeapon(WEAPONTYPE_COLT45);
-								}
-							} else {
-								bStopAndShoot = true;
-							}
-							SetMoveState(PEDMOVE_STILL);
-							SetMoveAnim();
-							break;
-						}
-						bStopAndShoot = false;
-						SetMoveAnim();
+					if (status == CANT_ATTACK)
 						break;
-					}
-				}
-				if (m_attackTimer < CTimer::GetTimeInMilliseconds()
-					&& distWithTargetSc < wepRange && m_pedInObjective->m_nPedState != PED_GETUP && m_pedInObjective->m_nPedState != PED_DRAG_FROM_CAR) {
-					if (bIsDucking) {
-						CAnimBlendAssociation *duckAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_DOWN);
-						if (duckAnim) {
-							duckAnim->blendDelta = -2.0f;
-							break;
-						}
-						bIsDucking = false;
-					} else if (wepRange <= 5.0f) {
-						SetMoveState(PEDMOVE_STILL);
-						SetAttack(m_pedInObjective);
-						m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
-							m_pedInObjective->GetPosition().x, m_pedInObjective->GetPosition().y,
-							GetPosition().x, GetPosition().y);
-						SetShootTimer(CGeneral::GetRandomNumberInRange(0.0f, 500.0f));
-						SetAttackTimer(CGeneral::GetRandomNumberInRange(0.0f, 1500.0f));
-						bObstacleShowedUpDuringKillObjective = false;
-
-					} else {
-						CVector target;
-						CVector ourHead = GetMatrix() * CVector(0.5f, 0.0f, 0.6f);
-						if (m_pedInObjective->IsPed())
-							m_pedInObjective->m_pedIK.GetComponentPosition(*(RwV3d *)&target, PED_MID);
-						else
-							target = m_pedInObjective->GetPosition();
-
-						target -= ourHead;
-						target.Normalise();
-						target = target * wepInfo->m_fRange + ourHead;
-
-						CWorld::bIncludeDeadPeds = true;
-						CEntity *foundEnt = nil;
-						CColPoint foundCol;
-
-						CWorld::ProcessLineOfSight(
-							ourHead, target, foundCol, foundEnt,
-							true, true, true, false, true, false);
-						CWorld::bIncludeDeadPeds = 0;
-						if (foundEnt == m_pedInObjective) {
-							SetAttack(m_pedInObjective);
-							m_pPointGunAt = m_pedInObjective;
-							if (m_pedInObjective)
-								m_pedInObjective->RegisterReference((CEntity **) &m_pPointGunAt);
-
-							SetShootTimer(CGeneral::GetRandomNumberInRange(500.0f, 2000.0f));
-
-							int time;
-							if (distWithTargetSc <= wepRangeAdjusted)
-								time = CGeneral::GetRandomNumberInRange(100.0f, 500.0f);
-							else
-								time = CGeneral::GetRandomNumberInRange(1500.0f, 3000.0f);
-
-							SetAttackTimer(time);
-							bObstacleShowedUpDuringKillObjective = false;
-
-						} else if (foundEnt) {
-							if (foundEnt->IsPed()) {
-								SetAttackTimer(CGeneral::GetRandomNumberInRange(500.0f, 1000.0f));
-								bObstacleShowedUpDuringKillObjective = false;
-							} else {
-								if (foundEnt->IsObject()) {
-									SetAttackTimer(CGeneral::GetRandomNumberInRange(200.0f, 400.0f));
-									bObstacleShowedUpDuringKillObjective = true;
-								} else if (foundEnt->IsVehicle()) {
-									SetAttackTimer(CGeneral::GetRandomNumberInRange(400.0f, 600.0f));
-									bObstacleShowedUpDuringKillObjective = true;
-								} else {
-									SetAttackTimer(CGeneral::GetRandomNumberInRange(700.0f, 1200.0f));
-									bObstacleShowedUpDuringKillObjective = true;
-								}
-							}
-
-							m_fleeFrom = foundEnt;
-							m_fleeFrom->RegisterReference((CEntity**) &m_fleeFrom);
-							SetPointGunAt(m_pedInObjective);
-						}
-					}
-				} else {
-					if (!m_pedInObjective->m_pCurrentPhysSurface)
-						bStopAndShoot = false;
-
-					if (m_nPedState != PED_ATTACK && m_nPedState != PED_FIGHT) {
-
-						// This is weird...
-						if (bNotAllowedToDuck && bKindaStayInSamePlace) {
-							if (!bIsDucking) {
-								CAnimBlendAssociation* duckAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_DOWN);
-								if (!duckAnim || duckAnim->blendDelta < 0.0f) {
-									CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_DUCK_DOWN, 4.0f);
-									bIsDucking = true;
-								}
-								break;
-							} else {
-								CAnimBlendAssociation* duckAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_DOWN);
-								if (!duckAnim || duckAnim->blendDelta < 0.0f) {
-									bIsDucking = false;
-								} else {
-									break;
-								}
-							}
-						}
-						if (bObstacleShowedUpDuringKillObjective) {
-							if (m_nPedType == PEDTYPE_COP) {
-								if (GetWeapon()->m_eWeaponType > WEAPONTYPE_COLT45
-									|| m_fleeFrom && m_fleeFrom->IsObject()) {
-									wepRangeAdjusted = 6.0f;
-								} else if (m_fleeFrom && m_fleeFrom->IsVehicle()) {
-									wepRangeAdjusted = 4.0f;
-								} else {
-									wepRangeAdjusted = 2.0f;
-								}
-							} else {
-								wepRangeAdjusted = 2.0f;
-							}
-						}
-						if (distWithTargetSc <= wepRangeAdjusted) {
-							SetMoveState(PEDMOVE_STILL);
-							bIsPointingGunAt = true;
-							if (m_nPedState != PED_AIM_GUN && !bDuckAndCover) {
-								m_attackTimer = CTimer::GetTimeInMilliseconds();
-								SetIdle();
-							}
-						} else {
-							if (m_nPedState != PED_SEEK_ENTITY && m_nPedState != PED_SEEK_POS
-								&& !bStopAndShoot && !killPlayerInNoPoliceZone && !bKindaStayInSamePlace) {
-								Say(SOUND_PED_ATTACK);
-								SetSeek(m_pedInObjective, wepRangeAdjusted);
-								bIsRunning = true;
-							}
-						}
-					}
 				}
-
-				if (distWithTargetSc < 2.5f && wepRange > 5.0f
-					&& wepInfo->m_eWeaponFire != WEAPON_FIRE_MELEE) {
-
-					SetAttack(m_pedInObjective);
-					if (m_attackTimer < CTimer::GetTimeInMilliseconds()) {
-						int time = CGeneral::GetRandomNumberInRange(500.0f, 1000.0f);
-						SetAttackTimer(time);
-						SetShootTimer(time - 500);
-					}
-					SetMoveState(PEDMOVE_STILL);
-				}
-				if (CTimer::GetTimeInMilliseconds() > m_nPedStateTimer)
-					m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(m_pedInObjective->GetPosition().x, m_pedInObjective->GetPosition().y, GetPosition().x, GetPosition().y);
-				
 				SetMoveAnim();
 				break;
 			}
@@ -14475,6 +14273,8 @@ CPed::ProcessObjective(void)
 					float safeDistance = 2.0f;
 					if (m_pedInObjective->bInVehicle)
 						safeDistance = 3.0f;
+					if (m_objective == OBJECTIVE_HASSLE_CHAR)
+						safeDistance = 1.0f;
 
 					float distWithTargetSc = distWithTarget.Magnitude();
 					if (m_nPedStateTimer < CTimer::GetTimeInMilliseconds()) {
@@ -14482,6 +14282,8 @@ CPed::ProcessObjective(void)
 							bScriptObjectiveCompleted = true;
 							if (m_nPedState != PED_ATTACK) {
 								SetIdle();
+								if (m_pLookTarget)
+									m_pLookTarget->CleanUpOldReference(&m_pLookTarget);
 								m_pLookTarget = m_pedInObjective;
 								m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
 								TurnBody();
@@ -14490,6 +14292,18 @@ CPed::ProcessObjective(void)
 								SetMoveState(m_pedInObjective->m_nMoveState);
 							else
 								SetMoveState(PEDMOVE_STILL);
+
+							if (m_objective == OBJECTIVE_HASSLE_CHAR) {
+								Say(SOUND_PED_COP_REACTION);
+								m_pedInObjective->Say(SOUND_PED_UNK_126);
+								m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 3000;
+								m_pedInObjective->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 3000;
+								SetObjective(OBJECTIVE_WANDER);
+								m_pedInObjective->SetObjective(OBJECTIVE_WANDER);
+								CVector2D dist = GetPosition() - m_pedInObjective->GetPosition();
+								m_nPathDir = CGeneral::GetNodeHeadingFromVector(dist.x, dist.y);
+								m_pedInObjective->m_nPathDir = CGeneral::GetNodeHeadingFromVector(-dist.x, -dist.y);
+							}
 						} else {
 							SetSeek(m_pedInObjective, safeDistance);
 							if (distWithTargetSc >= 5.0f) {
@@ -15382,7 +15196,7 @@ CPed::ProcessObjective(void)
 #endif
 		}
 		if (bObjectiveCompleted
-			|| m_objectiveTimer != 0 && CTimer::GetTimeInMilliseconds() > m_objectiveTimer) {
+			|| m_objectiveTimer > 0 && CTimer::GetTimeInMilliseconds() > m_objectiveTimer) {
 			RestorePreviousObjective();
 			if (m_objectiveTimer > CTimer::GetTimeInMilliseconds() || !m_objectiveTimer)
 				m_objectiveTimer = CTimer::GetTimeInMilliseconds() - 1;
@@ -17877,11 +17691,8 @@ CPed::ScanForThreats(void)
 			}
 
 			if (CPedType::GetFlag(shooter->m_nPedType) & fearFlags || m_nPedType == PEDTYPE_GANG5) {
-
-				// TODO(Miami)
-				// if (m_threatEntity)
-				//	m_threatEntity->CleanUpOldReference(&m_threatEntity);
-
+				if (m_threatEntity)
+					m_threatEntity->CleanUpOldReference(&m_threatEntity);
 				m_threatEntity = shooter;
 				m_threatEntity->RegisterReference((CEntity**)&m_threatEntity);
 				return CPedType::GetFlag(shooter->m_nPedType);
@@ -18571,6 +18382,8 @@ CPed::UpdateFromLeader(void)
 							m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
 							TurnBody();
 							if (m_attackTimer < CTimer::GetTimeInMilliseconds() && !GetWeapon()->IsTypeMelee()) {
+								if (m_pPointGunAt)
+									m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
 								m_pPointGunAt = m_threatEntity;
 								if (m_threatEntity)
 									m_threatEntity->RegisterReference((CEntity **) &m_pPointGunAt);
@@ -20547,6 +20360,536 @@ CPed::PositionAttachedPed()
 	}
 }
 
+// --MIAMI: Done
+int32
+CPed::KillCharOnFootMelee(CVector &ourPos, CVector &targetPos, CVector &distWithTarget)
+{
+	bool killPlayerInNoPoliceZone = false;
+	float distWithTargetSc = distWithTarget.Magnitude();
+	CPlayerPed *victimPlayer = nil;
+	if (m_pedInObjective->IsPlayer())
+		victimPlayer = (CPlayerPed*)m_pedInObjective;
+
+	if (victimPlayer) {
+		if (CCullZones::NoPolice()
+			|| m_pedInObjective->m_pCurrentPhysSurface
+			&& m_pedInObjective->m_pCurrentPhysSurface != m_pCurrentPhysSurface
+			&& distWithTargetSc < 5.f) {
+
+			if (victimPlayer && victimPlayer->m_bSpeedTimerFlag && (IsGangMember() || m_nPedType == PEDTYPE_COP)
+				&& CharCreatedBy != MISSION_CHAR) {
+				GiveWeapon(WEAPONTYPE_COLT45, 1000, 1);
+				SetCurrentWeapon(WEAPONTYPE_COLT45);
+				SetMoveState(PEDMOVE_STILL);
+				bStopAndShoot = true;
+				b158_8 = true;
+				return CANT_ATTACK;
+			}
+			killPlayerInNoPoliceZone = true;
+		}
+	}
+	bNotAllowedToDuck = false;
+	bStopAndShoot = false;
+	b158_8 = false;
+	if (m_leaveCarTimer > CTimer::GetTimeInMilliseconds() && !bKindaStayInSamePlace) {
+		SetMoveState(PEDMOVE_STILL);
+		return CANT_ATTACK;
+	}
+	if (victimPlayer) {
+		CPlayerPed *player = FindPlayerPed();
+		if (m_nPedType == PEDTYPE_COP && player->m_pWanted->m_bIgnoredByCops
+			|| player->m_pWanted->m_bIgnoredByEveryone
+			|| m_pedInObjective->bIsInWater
+			|| m_pedInObjective->m_nPedState == PED_ARRESTED) {
+
+			if (m_nPedState != PED_ARREST_PLAYER)
+				SetIdle();
+
+			return CANT_ATTACK;
+		}
+	}
+	if (victimPlayer && m_nPedType != PEDTYPE_COP && CharCreatedBy != MISSION_CHAR
+		&& FindPlayerPed()->m_pWanted->m_CurrentCops != 0) {
+		SetObjective(OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE);
+
+		return CANT_ATTACK;
+	}
+	if (m_pedInObjective->m_fHealth <= 0.0f) {
+		bObjectiveCompleted = true;
+		bScriptObjectiveCompleted = true;
+		return ATTACK_IN_PROGRESS;
+	}
+	bool canReachVictim = false;
+	uint32 endOfAttack = 0;
+	CWeaponInfo *wepInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
+
+	// Already calculated at the start
+	// float distWithTargetSc = distWithTarget.Magnitude();
+	float wepRange = 0.3f;
+	float wepRangeAdjusted = wepInfo->m_fRange / 2.f;
+
+	if (GetWeapon()->m_eWeaponType == WEAPONTYPE_UNARMED && !IsPlayer() && !(m_pedStats->m_flags & STAT_CAN_KICK))
+		wepRangeAdjusted -= 0.3f;
+
+	if (distWithTargetSc <= 5.f && victimPlayer && !victimPlayer->m_bDrunkVisualsWearOff) {
+
+		if (m_pedInObjective->EnteringCar() && wepRangeAdjusted > 2.f) {
+			m_vecSeekPos = m_pedInObjective->GetPosition();
+			wepRangeAdjusted = 1.0f;
+			wepRange = 0.5f;
+		} else {
+			int8 attackDir = victimPlayer->FindMeleeAttackPoint(this, distWithTarget, endOfAttack);
+			if (attackDir == -1) {
+				m_vecSeekPos = victimPlayer->GetPosition();
+				wepRange = 4.0f;
+			} else {
+				victimPlayer->GetMeleeAttackCoords(m_vecSeekPos, attackDir, wepRangeAdjusted);
+				distWithTargetSc = (m_vecSeekPos - GetPosition()).Magnitude();
+				canReachVictim = true;
+			}
+		}
+	} else {
+		m_vecSeekPos = m_pedInObjective->GetPosition();
+		wepRange = Max(0.8f, 0.9f * wepRangeAdjusted);
+		wepRangeAdjusted = 1.1f * wepRangeAdjusted;
+		if (victimPlayer && victimPlayer->m_bDrunkVisualsWearOff)
+			victimPlayer = nil;
+	}
+
+	if (m_pedInObjective->bInVehicle && m_pedInObjective->m_nPedState != PED_DRAG_FROM_CAR) {
+		CVehicle *vehOfTarget = m_pedInObjective->m_pMyVehicle;
+
+		if (vehOfTarget){
+			if (vehOfTarget->bIsInWater || vehOfTarget->GetStatus() == STATUS_PLAYER_DISABLED
+				|| m_pedInObjective->IsPlayer() && CPad::GetPad(0)->ArePlayerControlsDisabled()) {
+				SetIdle();
+				return WATCH_UNTIL_HE_DISAPPEARS;
+			}
+			SetLookFlag(vehOfTarget, false);
+
+			if (m_nPedState != PED_CARJACK) {
+				if (m_pedInObjective->m_nPedState != PED_ARRESTED) {
+					if (m_nPedState != PED_ATTACK && !bKindaStayInSamePlace && !killPlayerInNoPoliceZone) {
+
+						if (m_nPedType == PEDTYPE_COP || vehOfTarget->bIsBus) {
+							GoToNearestDoor(vehOfTarget);
+						} else {
+							m_vehEnterType = 0;
+							if (m_pedInObjective == vehOfTarget->pDriver || vehOfTarget->bIsBus) {
+								m_vehEnterType = CAR_DOOR_LF;
+							} else if (m_pedInObjective == vehOfTarget->pPassengers[0]) {
+								m_vehEnterType = CAR_DOOR_RF;
+							} else if (m_pedInObjective == vehOfTarget->pPassengers[1]) {
+								m_vehEnterType = CAR_DOOR_LR;
+							} else if (m_pedInObjective == vehOfTarget->pPassengers[2]) {
+								m_vehEnterType = CAR_DOOR_RR;
+							}
+							// Unused
+							// GetPositionToOpenCarDoor(vehOfTarget, m_vehEnterType);
+							SetSeekCar(vehOfTarget, m_vehEnterType);
+							SetMoveState(PEDMOVE_RUN);
+						}
+					}
+				}
+			}
+		}
+		return ATTACK_IN_PROGRESS;
+	}
+	if (m_nMoveState == PEDMOVE_STILL && IsPedInControl()) {
+		SetLookFlag(m_pedInObjective, false);
+		if(m_nPedState == PED_IDLE || m_nPedState == PED_ATTACK || m_nPedState == PED_FIGHT)
+			TurnBody();
+	}
+	if (m_nPedType == PEDTYPE_COP && m_pedInObjective->IsPlayer()) {
+		float maxArrestDist = 1.5f;
+		if (((CCopPed*)this)->field_601) {
+			if (m_nPedState == PED_FALL) {
+				maxArrestDist = 3.5f;
+			} else if (m_nPedState != PED_DRAG_FROM_CAR) {
+				((CCopPed*)this)->field_601 = 0;
+			}
+		}
+
+		if (distWithTargetSc < maxArrestDist) {
+			if (m_pedInObjective->m_getUpTimer > CTimer::GetTimeInMilliseconds()
+				|| m_pedInObjective->m_nPedState == PED_DRAG_FROM_CAR) {
+
+				((CCopPed*)this)->SetArrestPlayer(m_pedInObjective);
+				return WATCH_UNTIL_HE_DISAPPEARS;
+			}
+		}
+	}
+
+	if (distWithTargetSc > wepRange && !bKindaStayInSamePlace && m_nPedState != PED_ATTACK &&
+		(m_nPedState != PED_FIGHT || m_curFightMove == FIGHTMOVE_IDLE) && !killPlayerInNoPoliceZone) {
+
+		bool goForward = false;
+
+		if (m_nPedState == PED_FIGHT) {
+			if (canReachVictim) {
+				CVector attackAndVictimDist = m_vecSeekPos - m_pedInObjective->GetPosition();
+				CVector victimFarness = attackAndVictimDist / wepRangeAdjusted;
+				CVector distVec = GetPosition() - m_pedInObjective->GetPosition();
+				float distSqr = distVec.MagnitudeSqr();
+				if (sq(wepRangeAdjusted) > distSqr && distSqr > 0.05f) {
+					distVec.Normalise();
+					if (DotProduct2D(victimFarness, distVec) > Cos(DEGTORAD(30.f)))
+						goForward = true;
+				}
+			}
+		}
+		if (goForward) {
+			m_curFightMove = FIGHTMOVE_SHUFFLE_F;
+			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT_SH_BACK, 16.f)->SetFinishCallback(FinishFightMoveCB,this);
+			m_fightState = FIGHTSTATE_NO_MOVE;
+			m_fightButtonPressure = 0;
+			m_takeAStepAfterAttack = false;
+
+		} else if (bUsePedNodeSeek && !canReachVictim) {
+			CVector bestCoords(0.0f, 0.0f, 0.0f);
+
+			if (!m_pNextPathNode)
+				FindBestCoordsFromNodes(m_vecSeekPos, &bestCoords);
+
+			if (m_pNextPathNode)
+				m_vecSeekPos = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
+
+			SetSeek(m_vecSeekPos, m_distanceToCountSeekDone);
+		} else {
+			if (canReachVictim)
+				SetSeek(m_vecSeekPos, wepRange);
+			else
+				SetSeek(m_pedInObjective, wepRange);
+		}
+		return ATTACK_IN_PROGRESS;
+	}
+
+	if (m_attackTimer < CTimer::GetTimeInMilliseconds()
+		&& distWithTargetSc < wepRangeAdjusted && m_pedInObjective->m_nPedState != PED_GETUP && m_pedInObjective->m_nPedState != PED_DRAG_FROM_CAR) {
+
+		if (bIsDucking) {
+			CAnimBlendAssociation* duckAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_DOWN);
+			if (!duckAnim)
+				duckAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_LOW);
+			if (!duckAnim)
+				duckAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCH);
+
+			if (duckAnim) {
+				duckAnim->flags |= ASSOC_DELETEFADEDOUT;
+				duckAnim->blendDelta = -4.0f;
+			}
+			bIsDucking = false;
+			return CANT_ATTACK;
+		}
+
+		if (canReachVictim || !victimPlayer) {
+			SetMoveState(PEDMOVE_STILL);
+			SetAttack(m_pedInObjective);
+			m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
+				m_pedInObjective->GetPosition().x, m_pedInObjective->GetPosition().y,
+				GetPosition().x, GetPosition().y);
+			SetShootTimer(CGeneral::GetRandomNumberInRange(0.f, 500.f));
+
+			int time;
+			if (endOfAttack <= CTimer::GetTimeInMilliseconds())
+				time = CGeneral::GetRandomNumberInRange(100.0f, 1500.0f);
+			else
+				time = endOfAttack - CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(400.0f, 1500.0f);
+
+			SetAttackTimer(time);
+			bObstacleShowedUpDuringKillObjective = false;
+		}
+		return ATTACK_IN_PROGRESS;
+	} else {
+		if (!m_pedInObjective->m_pCurrentPhysSurface && m_pCurrentPhysSurface && b158_8) {
+			b158_8 = false;
+			bStopAndShoot = false;
+		}
+
+		if (m_nPedState != PED_ATTACK && m_nPedState != PED_FIGHT) {
+			SetMoveState(PEDMOVE_STILL);
+			if (GetWeapon()->m_eWeaponType == WEAPONTYPE_UNARMED)
+				StartFightAttack(0);
+		}
+		return ATTACK_IN_PROGRESS;
+	}
+}
+
+// --MIAMI: Done
+int32
+CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWithTarget)
+{
+	bool killPlayerInNoPoliceZone = false;
+	if (m_pedInObjective->IsPlayer() && CCullZones::NoPolice())
+		killPlayerInNoPoliceZone = true;
+
+	if (!bNotAllowedToDuck || killPlayerInNoPoliceZone) {
+		if (m_nPedType == PEDTYPE_COP && !m_pedInObjective->GetWeapon()->IsTypeMelee())
+			bNotAllowedToDuck = true;
+	} else {
+		if (!m_pedInObjective->bInVehicle) {
+			if (m_pedInObjective->GetWeapon()->IsTypeMelee()) {
+				bNotAllowedToDuck = false;
+				bCrouchWhenShooting = false;
+			} else if (DuckAndCover()) {
+				return CANT_ATTACK;
+			}
+		} else {
+			bNotAllowedToDuck = false;
+			bCrouchWhenShooting = false;
+		}
+	}
+	if (m_leaveCarTimer > CTimer::GetTimeInMilliseconds() && !bKindaStayInSamePlace) {
+		SetMoveState(PEDMOVE_STILL);
+		return CANT_ATTACK;
+	}
+	if (m_pedInObjective->IsPlayer()) {
+		CPlayerPed *player = FindPlayerPed();
+		if (m_nPedType == PEDTYPE_COP && player->m_pWanted->m_bIgnoredByCops
+			|| player->m_pWanted->m_bIgnoredByEveryone
+			|| m_pedInObjective->bIsInWater
+			|| m_pedInObjective->m_nPedState == PED_ARRESTED) {
+
+			if (m_nPedState != PED_ARREST_PLAYER)
+				SetIdle();
+
+			return CANT_ATTACK;
+		}
+	}
+	if (m_pedInObjective->IsPlayer() && m_nPedType != PEDTYPE_COP
+		&& CharCreatedBy != MISSION_CHAR && FindPlayerPed()->m_pWanted->m_CurrentCops != 0) {
+		SetObjective(OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE);
+
+		return CANT_ATTACK;
+	}
+	if (m_pedInObjective->m_fHealth <= 0.0f) {
+		bObjectiveCompleted = true;
+		bScriptObjectiveCompleted = true;
+		return CANT_ATTACK;
+	}
+	CWeaponInfo *wepInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
+	float wepRange = wepInfo->m_fRange;
+	float wepRangeAdjusted = wepRange / 3.f;
+
+	float distWithTargetSc = distWithTarget.Magnitude();
+	if (m_pedInObjective->bInVehicle && m_pedInObjective->m_nPedState != PED_DRAG_FROM_CAR) {
+		CVehicle *vehOfTarget = m_pedInObjective->m_pMyVehicle;
+		if (vehOfTarget->bIsInWater || vehOfTarget->GetStatus() == STATUS_PLAYER_DISABLED
+			|| m_pedInObjective->IsPlayer() && CPad::GetPad(0)->ArePlayerControlsDisabled()) {
+			SetIdle();
+			return WATCH_UNTIL_HE_DISAPPEARS;
+		}
+		SetLookFlag(vehOfTarget, false);
+		if (m_nMoveState == PEDMOVE_STILL && IsPedInControl())
+			TurnBody();
+
+		if (m_nPedState != PED_CARJACK) {
+			if (m_pedInObjective->m_nPedState != PED_ARRESTED) {
+				if (m_attackTimer < CTimer::GetTimeInMilliseconds() && distWithTargetSc < wepRange && distWithTargetSc > 3.0f) {
+
+					SetAttack(vehOfTarget);
+					if (m_pPointGunAt)
+						m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
+
+					m_pPointGunAt = vehOfTarget;
+					if (vehOfTarget)
+						vehOfTarget->RegisterReference((CEntity **) &m_pPointGunAt);
+
+					SetShootTimer(CGeneral::GetRandomNumberInRange(500, 2000));
+					if (distWithTargetSc <= m_distanceToCountSeekDone) {
+						SetAttackTimer(CGeneral::GetRandomNumberInRange(200, 500));
+						SetMoveState(PEDMOVE_STILL);
+					} else {
+						SetAttackTimer(CGeneral::GetRandomNumberInRange(2000, 5000));
+					}
+					return ATTACK_IN_PROGRESS;
+				} else if (m_nPedState != PED_ATTACK && !bKindaStayInSamePlace && !killPlayerInNoPoliceZone) {
+					if (vehOfTarget) {
+						if (m_nPedType == PEDTYPE_COP || vehOfTarget->bIsBus) {
+							GoToNearestDoor(vehOfTarget);
+						} else {
+							m_vehEnterType = 0;
+							if (m_pedInObjective == vehOfTarget->pDriver || vehOfTarget->bIsBus) {
+								m_vehEnterType = CAR_DOOR_LF;
+							} else if (m_pedInObjective == vehOfTarget->pPassengers[0]) {
+								m_vehEnterType = CAR_DOOR_RF;
+							} else if (m_pedInObjective == vehOfTarget->pPassengers[1]) {
+								m_vehEnterType = CAR_DOOR_LR;
+							} else if (m_pedInObjective == vehOfTarget->pPassengers[2]) {
+								m_vehEnterType = CAR_DOOR_RR;
+							}
+							// Unused
+							// GetPositionToOpenCarDoor(vehOfTarget, m_vehEnterType);
+							SetSeekCar(vehOfTarget, m_vehEnterType);
+							SetMoveState(PEDMOVE_RUN);
+						}
+					}
+				}
+			}
+		}
+		return ATTACK_IN_PROGRESS;
+	}
+	if (m_nMoveState == PEDMOVE_STILL && IsPedInControl()) {
+		SetLookFlag(m_pedInObjective, false);
+		TurnBody();
+	}
+	if (m_nPedType == PEDTYPE_COP && m_pedInObjective->IsPlayer()) {
+		float maxArrestDist = 1.5f;
+		if (((CCopPed*)this)->field_601) {
+			if (m_nPedState == PED_FALL) {
+				maxArrestDist = 3.5f;
+			} else if (m_nPedState != PED_DRAG_FROM_CAR) {
+				((CCopPed*)this)->field_601 = 0;
+			}
+		}
+
+		if (distWithTargetSc < maxArrestDist) {
+			if (m_pedInObjective->m_getUpTimer > CTimer::GetTimeInMilliseconds()
+				|| m_pedInObjective->m_nPedState == PED_DRAG_FROM_CAR) {
+
+				((CCopPed*)this)->SetArrestPlayer(m_pedInObjective);
+				return WATCH_UNTIL_HE_DISAPPEARS;
+			}
+		}
+	}
+	/*
+	if (distWithTargetSc > 0.1f) {
+		junk code
+	} */
+
+	if (m_shotTime != 0 && m_ceaseAttackTimer != 0) {
+		if (CTimer::GetTimeInMilliseconds() > m_ceaseAttackTimer + m_shotTime) {
+			ClearLookFlag();
+			bObjectiveCompleted = true;
+			m_shotTime = 0;
+			return CANT_ATTACK;
+		}
+	}
+
+	if (!bKindaStayInSamePlace && !bStopAndShoot && m_nPedState != PED_ATTACK && !bDuckAndCover && !killPlayerInNoPoliceZone) {
+		if (distWithTargetSc > wepRange
+			|| m_pedInObjective->m_getUpTimer > CTimer::GetTimeInMilliseconds()
+			|| m_pedInObjective->m_nPedState == PED_ARRESTED
+			|| m_pedInObjective->EnteringCar() && distWithTargetSc < 3.0f) {
+
+			if (m_pedInObjective->EnteringCar())
+				wepRangeAdjusted = 2.0f;
+
+			if (bUsePedNodeSeek) {
+				CVector bestCoords(0.0f, 0.0f, 0.0f);
+				m_vecSeekPos = m_pedInObjective->GetPosition();
+
+				if (!m_pNextPathNode)
+					FindBestCoordsFromNodes(m_vecSeekPos, &bestCoords);
+
+				if (m_pNextPathNode)
+					m_vecSeekPos = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
+
+				SetSeek(m_vecSeekPos, m_distanceToCountSeekDone);
+			} else {
+				SetSeek(m_pedInObjective, wepRangeAdjusted);
+			}
+			if (m_pedInObjective->m_pCurrentPhysSurface && distWithTargetSc < 5.0f) {
+				bStopAndShoot = true;
+				b158_8 = true;
+				SetMoveState(PEDMOVE_STILL);
+			} else if (b158_8) {
+				bStopAndShoot = false;
+				b158_8 = false;
+			}
+			return ATTACK_IN_PROGRESS;
+		}
+	}
+	if (m_attackTimer < CTimer::GetTimeInMilliseconds()
+		&& distWithTargetSc < wepRange && m_pedInObjective->m_nPedState != PED_GETUP && m_pedInObjective->m_nPedState != PED_DRAG_FROM_CAR) {
+
+		if (bIsDucking && !bCrouchWhenShooting) {
+			CAnimBlendAssociation* duckAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_DOWN);
+			if (!duckAnim)
+				duckAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_LOW);
+			if (!duckAnim)
+				duckAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCH);
+
+			if (duckAnim) {
+				duckAnim->flags |= ASSOC_DELETEFADEDOUT;
+				duckAnim->blendDelta = -4.0f;
+			}
+			bIsDucking = false;
+			return CANT_ATTACK;
+		}
+		bObstacleShowedUpDuringKillObjective = false;
+		SetAttack(m_pedInObjective);
+		if (m_pPointGunAt)
+			m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
+
+		m_pPointGunAt = m_pedInObjective;
+		if (m_pedInObjective)
+			m_pedInObjective->RegisterReference((CEntity**)&m_pPointGunAt);
+
+		SetShootTimer(CGeneral::GetRandomNumberInRange(900.0f, 1500.0f));
+
+		int time;
+		if (distWithTargetSc <= wepRangeAdjusted)
+			time = CGeneral::GetRandomNumberInRange(100.0f, 500.0f);
+		else
+			time = CGeneral::GetRandomNumberInRange(1500.0f, 3000.0f);
+
+		SetAttackTimer(time);
+	} else {
+		if (!m_pedInObjective->m_pCurrentPhysSurface && b158_8) {
+			b158_8 = false;
+			bStopAndShoot = false;
+		}
+
+		if (m_nPedState != PED_ATTACK && m_nPedState != PED_FIGHT) {
+			if (bNotAllowedToDuck && bKindaStayInSamePlace && !bIsDucking && bCrouchWhenShooting) {
+				SetDuck(CGeneral::GetRandomNumberInRange(4000, 5000), false);
+				return CANT_ATTACK;
+			}
+			if (bObstacleShowedUpDuringKillObjective) {
+				if (m_nPedType == PEDTYPE_COP) {
+					if (GetWeapon()->m_eWeaponType > WEAPONTYPE_COLT45
+						|| m_fleeFrom && m_fleeFrom->IsObject()) {
+						wepRangeAdjusted = 6.0f;
+					} else if (m_fleeFrom && m_fleeFrom->IsVehicle()) {
+						wepRangeAdjusted = 4.0f;
+					} else {
+						wepRangeAdjusted = 2.0f;
+					}
+				} else {
+					wepRangeAdjusted = 2.0f;
+				}
+			}
+			if (distWithTargetSc <= wepRangeAdjusted) {
+				SetMoveState(PEDMOVE_STILL);
+				bIsPointingGunAt = true;
+				if (m_nPedState != PED_AIM_GUN && !bDuckAndCover) {
+					m_attackTimer = CTimer::GetTimeInMilliseconds();
+					SetIdle();
+				}
+			} else {
+				if (m_nPedState != PED_SEEK_ENTITY && m_nPedState != PED_SEEK_POS
+					&& !bStopAndShoot && !killPlayerInNoPoliceZone && !bKindaStayInSamePlace) {
+					Say(SOUND_PED_ATTACK);
+					SetSeek(m_pedInObjective, wepRangeAdjusted);
+					bIsRunning = true;
+					if (m_nPedType == PEDTYPE_COP && FindPlayerPed()->m_pWanted->m_CurrentCops > 1) {
+						if (CGeneral::GetRandomNumber() & 1)
+							Say(SOUND_PED_GUNAIMEDAT3);
+						else
+							Say(SOUND_PED_GUNAIMEDAT2);
+					}
+				}
+			}
+		}
+	}
+
+	if (CTimer::GetTimeInMilliseconds() > m_nPedStateTimer)
+		m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(m_pedInObjective->GetPosition().x, m_pedInObjective->GetPosition().y, GetPosition().x, GetPosition().y);
+				
+	return ATTACK_IN_PROGRESS;
+}
+
 void
 PlayRandomAnimationsFromAnimBlock(CPed* ped, AssocGroupId animGroup, uint32 first, uint32 amount)
 {
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index c8621c82..b3d2f71c 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -30,6 +30,13 @@ struct PedAudioData
 	int m_nMaxRandomDelayTime;
 };
 
+enum
+{
+	ATTACK_IN_PROGRESS,
+	CANT_ATTACK,
+	WATCH_UNTIL_HE_DISAPPEARS,
+};
+
 enum eFormation
 {
 	FORMATION_UNDEFINED,
@@ -474,7 +481,7 @@ public:
 	uint32 bNeverEverTargetThisPed : 1;
 	uint32 bCrouchWhenScared : 1;
 	uint32 bKnockedOffBike : 1;
-	//uint32 b158_8
+	uint32 b158_8 : 1;
 	uint32 b158_10 : 1;
 	uint32 bBoughtIceCream : 1;
 	uint32 b158_40 : 1;
@@ -944,6 +951,8 @@ public:
 	void ClearWaitState(void);
 	void Undress(const char*);
 	void Dress(void);
+	int32 KillCharOnFootMelee(CVector&, CVector&, CVector&);
+	int32 KillCharOnFootArmed(CVector&, CVector&, CVector&);
 
 	bool HasWeaponSlot(uint8 slot) { return m_weapons[slot].m_eWeaponType != WEAPONTYPE_UNARMED; }
 	CWeapon& GetWeapon(uint8 slot) { return m_weapons[slot]; }
diff --git a/src/peds/PedDebug.cpp b/src/peds/PedDebug.cpp
index c3298461..0809581b 100644
--- a/src/peds/PedDebug.cpp
+++ b/src/peds/PedDebug.cpp
@@ -7,10 +7,11 @@
 #include "Sprite.h"
 #include "Text.h"
 
-
+// TODO(Miami)
 static char ObjectiveText[][28] = {
 	"No Obj",
 	"Wait on Foot",
+	"Wait on Foot For Cop",
 	"Flee on Foot Till Safe",
 	"Guard Spot",
 	"Guard Area",
@@ -21,6 +22,8 @@ static char ObjectiveText[][28] = {
 	"Flee Char on Foot Till Safe",
 	"Flee Char on Foot Always",
 	"GoTo Char on Foot",
+	"GoTo Char on Foot Walking",
+	"Hassle Char",
 	"Follow Char in Formation",
 	"Leave Car",
 	"Enter Car as Passenger",
@@ -42,10 +45,9 @@ static char ObjectiveText[][28] = {
 	"Catch Train",
 	"Buy IceCream",
 	"Steal Any Car",
+	"Steal Any Mission Car",
 	"Mug Char",
-#ifdef VC_PED_PORTS
-	"Leave Car and Die"
-#endif
+	"Leave Car and Die",
 };
 
 static char StateText[][18] = {
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index 98974bd3..cba01e31 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -35,7 +35,7 @@ CPlayerPed::~CPlayerPed()
 	delete m_pWanted;
 }
 
-// --MIAMI: Done except commented out things
+// --MIAMI: Done
 CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
 {
 	m_fMoveSpeed = 0.0f;
@@ -53,10 +53,8 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
 	m_nSpeedTimer = 0;
 	m_bSpeedTimerFlag = false;
 
-	// TODO(Miami)
-	// if (pPointGunAt)
-	//	m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
-
+	if (m_pPointGunAt)
+		m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
 	m_pPointGunAt = nil;
 	SetPedState(PED_IDLE);
 #ifndef FIX_BUGS
@@ -69,13 +67,14 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
 	m_fAttackButtonCounter = 0.0f;
 	m_bHaveTargetSelected = false;
 	m_bHasLockOnTarget = false;
-	m_bDrunkVisualsWearOff = true;
 	m_bCanBeDamaged = true;
+	m_bDrunkVisualsWearOff = false;
 	m_fWalkAngle = 0.0f;
 	m_fFPSMoveHeading = 0.0f;
 	m_pMinigunTopAtomic = nil;
 	m_fGunSpinSpeed = 0.0;
 	m_fGunSpinAngle = 0.0;
+	m_nPadDownPressedInMilliseconds = 0;
 	m_nTargettableObjects[0] = m_nTargettableObjects[1] = m_nTargettableObjects[2] = m_nTargettableObjects[3] = -1;
 	unused1 = false;
 	for (int i = 0; i < 6; i++) {
@@ -85,17 +84,16 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
 	}
 	m_nCheckPlayersIndex = 0;
 	m_nPadUpPressedInMilliseconds = 0;
-	m_nPadDownPressedInMilliseconds = 0;
 	idleAnimBlockIndex = CAnimManager::GetAnimationBlockIndex("playidles");
 }
 
-void CPlayerPed::ClearWeaponTarget()
+// --MIAMI: Done
+void
+CPlayerPed::ClearWeaponTarget()
 {
 	if (m_nPedType == PEDTYPE_PLAYER1) {
-
-		// TODO(Miami)
-		// if (m_pPointGunAt)
-		//	m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
+		if (m_pPointGunAt)
+			m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
 
 		m_pPointGunAt = nil;
 		TheCamera.ClearPlayerWeaponMode();
@@ -1816,6 +1814,7 @@ CPlayerPed::PlayIdleAnimations(CPad *padUsed)
 	}
 }
 
+// --MIAMI: Done
 void
 CPlayerPed::RemovePedFromMeleeList(CPed *ped)
 {
@@ -1828,6 +1827,100 @@ CPlayerPed::RemovePedFromMeleeList(CPed *ped)
 	ped->m_attackTimer = 0;
 }
 
+// --MIAMI: Done
+void
+CPlayerPed::GetMeleeAttackCoords(CVector& coords, int8 dir, float dist)
+{
+	coords = GetPosition();
+	switch (dir) {
+		case 0:
+			coords.y += dist;
+			break;
+		case 1:
+			coords.x += Sqrt(3.f / 4.f) * dist;
+			coords.y += 0.5f * dist;
+			break;
+		case 2:
+			coords.x += Sqrt(3.f / 4.f) * dist;
+			coords.y -= 0.5f * dist;
+			break;
+		case 3:
+			coords.y -= dist;
+			break;
+		case 4:
+			coords.x -= Sqrt(3.f / 4.f) * dist;
+			coords.y -= 0.5f * dist;
+			break;
+		case 5:
+			coords.x -= Sqrt(3.f / 4.f) * dist;
+			coords.y += 0.5f * dist;
+			break;
+		default:
+			break;
+	}
+}
+
+// --MIAMI: Done
+int32
+CPlayerPed::FindMeleeAttackPoint(CPed *victim, CVector &dist, uint32 &endOfAttackOut)
+{
+	endOfAttackOut = 0;
+	bool thereIsAnEmptySlot = false;
+	int dirToAttack = -1;
+	for (int i = 0; i < ARRAY_SIZE(m_pMeleeList); i++) {
+		CPed* pedAtThisDir = m_pMeleeList[i];
+		if (pedAtThisDir) {
+			if (pedAtThisDir == victim) {
+				dirToAttack = i;
+			} else {
+				if (pedAtThisDir->m_attackTimer > endOfAttackOut)
+					endOfAttackOut = pedAtThisDir->m_attackTimer;
+			}
+		} else {
+			thereIsAnEmptySlot = true;
+		}
+	}
+
+	// We don't have victim ped in our melee list
+	if (dirToAttack == -1 && thereIsAnEmptySlot) {
+		float angle = Atan2(-dist.x, -dist.y);
+		float adjustedAngle = angle + DEGTORAD(30.0f);
+		if (adjustedAngle < 0.f)
+			adjustedAngle += TWOPI;
+
+		int wantedDir = Floor(adjustedAngle / DEGTORAD(60.0f));
+
+		// And we have another ped at the direction of victim ped, so store victim to next empty direction to it's real direction. (Bollocks)
+		if (m_pMeleeList[wantedDir]) {
+			int closestDirToPreferred = -99;
+			int preferredDir = wantedDir;
+
+			for (int i = 0; i < ARRAY_SIZE(m_pMeleeList); i++) {
+				if (!m_pMeleeList[i]) {
+					if (Abs(i - preferredDir) < Abs(closestDirToPreferred - preferredDir))
+						closestDirToPreferred = i;
+				}
+			}
+			if (closestDirToPreferred > 0)
+				dirToAttack = closestDirToPreferred;
+		} else {
+
+			// Luckily the direction of victim ped is already empty, good
+			dirToAttack = wantedDir;
+		}
+
+		if (dirToAttack != -1) {
+			m_pMeleeList[dirToAttack] = victim;
+			victim->RegisterReference((CEntity**) &m_pMeleeList[dirToAttack]);
+			if (endOfAttackOut > CTimer::GetTimeInMilliseconds())
+				victim->m_attackTimer = endOfAttackOut + CGeneral::GetRandomNumberInRange(1000, 2000);
+			else
+				victim->m_attackTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(500, 1000);
+		}
+	}
+	return dirToAttack;
+}
+
 #ifdef COMPATIBLE_SAVES
 #define CopyFromBuf(buf, data) memcpy(&data, buf, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
 #define CopyToBuf(buf, data) memcpy(buf, &data, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
diff --git a/src/peds/PlayerPed.h b/src/peds/PlayerPed.h
index 7ff95ff3..3b8d8fcb 100644
--- a/src/peds/PlayerPed.h
+++ b/src/peds/PlayerPed.h
@@ -34,7 +34,7 @@ public:
 	bool m_bDrunkVisualsWearOff; // TODO(Miami): That may be something else
 	CVector m_vecSafePos[6]; // safe places from the player, for example behind a tree
 	CPed *m_pPedAtSafePos[6];
-	CPlayerPed* m_pMeleeList[6];
+	CPed *m_pMeleeList[6]; // reachable peds at each direction(6)
 	char unused1;
 	int16 m_nCheckPlayersIndex;
 	float m_fWalkAngle; //angle between heading and walking direction
@@ -85,6 +85,8 @@ public:
 	bool DoesPlayerWantNewWeapon(eWeaponType, bool);
 	void PlayIdleAnimations(CPad*);
 	void RemovePedFromMeleeList(CPed*);
+	void GetMeleeAttackCoords(CVector&, int8, float);
+	int32 FindMeleeAttackPoint(CPed*, CVector&, uint32&);
 
 	static void SetupPlayerPed(int32);
 	static void DeactivatePlayerPed(int32);
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index 6a3cdeaa..daafd27b 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -71,6 +71,7 @@ bool CHud::m_Wants_To_Draw_3dMarkers;
 wchar CHud::m_BigMessage[6][128];
 int16 CHud::m_ItemToFlash;
 bool CHud::m_HideRadar;
+int32 CHud::m_DrawClock;
 
 // These aren't really in CHud
 float CHud::BigMessageInUse[6];
@@ -519,7 +520,6 @@ void CHud::Draw()
 			DrawZoneName
 		*/
 		if (m_pZoneName) {
-			float fZoneAlpha = 255.0f;
 
 			if (m_pZoneName != m_pLastZoneName) {
 				switch (m_ZoneState) {
@@ -528,6 +528,8 @@ void CHud::Draw()
 					m_ZoneToPrint = m_pZoneName;
 					m_ZoneNameTimer = 0;
 					m_ZoneFadeTimer = 0;
+					if (m_VehicleState == 1 || m_VehicleState == 2)
+						m_VehicleState = 3;
 					break;
 				case 1:
 				case 2:
@@ -542,19 +544,20 @@ void CHud::Draw()
 				m_pLastZoneName = m_pZoneName;
 			}
 
+			float fZoneAlpha = 255.0f;
 			if (m_ZoneState) {
 				switch (m_ZoneState) {
 				case 1:
+					fZoneAlpha = 255.0f;
 					m_ZoneFadeTimer = 1000;
-					if (m_ZoneNameTimer > 10000) {
+					if (m_ZoneNameTimer > 10000.0f) {
 						m_ZoneFadeTimer = 1000;
 						m_ZoneState = 3;
 					}
-					fZoneAlpha = 255.0f;
 					break;
 				case 2:
 					m_ZoneFadeTimer += CTimer::GetTimeStepInMilliseconds();
-					if (m_ZoneFadeTimer > 1000) {
+					if (m_ZoneFadeTimer > 1000.0f) {
 						m_ZoneState = 1;
 						m_ZoneFadeTimer = 1000;
 					}
@@ -562,7 +565,7 @@ void CHud::Draw()
 					break;
 				case 3:
 					m_ZoneFadeTimer -= CTimer::GetTimeStepInMilliseconds();
-					if (m_ZoneFadeTimer < 0) {
+					if (m_ZoneFadeTimer < 0.0f) {
 						m_ZoneState = 0;
 						m_ZoneFadeTimer = 0;
 					}
@@ -570,7 +573,7 @@ void CHud::Draw()
 					break;
 				case 4:
 					m_ZoneFadeTimer -= CTimer::GetTimeStepInMilliseconds();
-					if (m_ZoneFadeTimer < 0) {
+					if (m_ZoneFadeTimer < 0.0f) {
 						m_ZoneFadeTimer = 0;
 						m_ZoneToPrint = m_pLastZoneName;
 						m_ZoneState = 2;
@@ -582,11 +585,8 @@ void CHud::Draw()
 
 				}
 
-#ifndef HUD_ENHANCEMENTS
-				if (!m_Message[0]) {
-#else
-				if (!m_Message[0] && !m_BigMessage[2][0]) { // Hide zone name if wasted/busted text is displaying
-#endif
+				if (!m_Message[0] && BigMessageInUse[1] == 0.0f && BigMessageInUse[2] == 0.0f) {
+
 					m_ZoneNameTimer += CTimer::GetTimeStepInMilliseconds();
 					CFont::SetJustifyOff();
 					CFont::SetPropOn();
@@ -606,11 +606,14 @@ void CHud::Draw()
 					CFont::SetDropShadowPosition(2);
 					CFont::SetDropColor(CRGBA(0, 0, 0, fZoneAlpha));
 					CFont::SetFontStyle(FONT_BANK);
-
 					CFont::SetColor(CRGBA(ZONE_COLOR.r, ZONE_COLOR.g, ZONE_COLOR.b, fZoneAlpha));
-					CFont::PrintStringFromBottom(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(128.0f), m_ZoneToPrint);
+
+					if (!CTheScripts::bPlayerIsInTheStatium)
+						CFont::PrintStringFromBottom(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(128.0f), m_ZoneToPrint);
 
 					CFont::SetSlant(0.f);
+				} else {
+					m_ZoneState = 3;
 				}
 			}
 		}
@@ -628,6 +631,8 @@ void CHud::Draw()
 					m_pVehicleNameToPrint = m_VehicleName;
 					m_VehicleNameTimer = 0;
 					m_VehicleFadeTimer = 0;
+					if (m_ZoneState == 1 || m_ZoneState == 2)
+						m_ZoneState = 3;
 					break;
 				case 1:
 				case 2:
@@ -723,23 +728,26 @@ void CHud::Draw()
 		/*
 			DrawClock
 		*/
-		CFont::SetJustifyOff();
-		CFont::SetCentreOff();
-		CFont::SetBackgroundOff();
-		CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
-		CFont::SetBackGroundOnlyTextOff();
-		CFont::SetPropOff();
-		CFont::SetFontStyle(FONT_HEADING);
-		CFont::SetRightJustifyOn();
-		CFont::SetRightJustifyWrap(0.0f);
-		CFont::SetDropShadowPosition(2);
-		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
+		if (m_DrawClock) {
+			CFont::SetJustifyOff();
+			CFont::SetCentreOff();
+			CFont::SetBackgroundOff();
+			CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
+			CFont::SetBackGroundOnlyTextOff();
+			CFont::SetPropOff();
+			CFont::SetFontStyle(FONT_HEADING);
+			CFont::SetRightJustifyOn();
+			CFont::SetRightJustifyWrap(0.0f);
+			CFont::SetDropShadowPosition(2);
+			CFont::SetDropColor(CRGBA(0, 0, 0, 255));
 
-		sprintf(sTemp, "%02d:%02d", CClock::GetHours(), CClock::GetMinutes());
-		AsciiToUnicode(sTemp, sPrint);
+			sprintf(sTemp, "%02d:%02d", CClock::GetHours(), CClock::GetMinutes());
+			AsciiToUnicode(sTemp, sPrint);
 
-		CFont::SetColor(CLOCK_COLOR);
-		CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(111.0f), SCREEN_SCALE_Y(22.0f), sPrint);
+			CFont::SetColor(CLOCK_COLOR);
+			if (FrontEndMenuManager.m_PrefsShowHud)
+				CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(111.0f), SCREEN_SCALE_Y(22.0f), sPrint);
+		}
 
 		/*
 			DrawOnScreenTimer
@@ -1011,6 +1019,11 @@ void CHud::Draw()
 			DrawSubtitles
 		*/
 		if (m_Message[0] && !m_BigMessage[2][0]) {
+			if (m_VehicleState != 0)
+				m_VehicleState = 3;
+			if (m_ZoneState != 0)
+				m_ZoneState = 3;
+
 			CFont::SetJustifyOff();
 			CFont::SetBackgroundOff();
 			CFont::SetBackgroundColor(CRGBA(0, 0, 0, 128));
@@ -1050,6 +1063,119 @@ void CHud::Draw()
 		}
 
 		/*
+			HelpMessage
+		*/
+
+		if (m_HelpMessage[0]) {
+			if (!CMessages::WideStringCompare(m_HelpMessage, m_LastHelpMessage, 256)) {
+				switch (m_HelpMessageState) {
+				case 0:
+					m_HelpMessageFadeTimer = 0;
+					m_HelpMessageState = 2;
+					m_HelpMessageTimer = 0;
+					CMessages::WideStringCopy(m_HelpMessageToPrint, m_HelpMessage, 256);
+					m_fHelpMessageTime = CMessages::GetWideStringLength(m_HelpMessage) * 0.05f + 3.0f;
+
+					if (TheCamera.m_ScreenReductionPercentage == 0.0f)
+						DMAudio.PlayFrontEndSound(SOUND_HUD_SOUND, 0);
+					break;
+				case 1:
+				case 2:
+				case 3:
+				case 4:
+					m_HelpMessageTimer = 5;
+					m_HelpMessageState = 4;
+					break;
+				default:
+					break;
+				}
+				CMessages::WideStringCopy(m_LastHelpMessage, m_HelpMessage, 256);
+			}
+
+			float fAlpha = 225.0f;
+
+			if (m_HelpMessageState != 0) {
+				switch (m_HelpMessageState) {
+				case 1:
+					fAlpha = 225.0f;
+					m_HelpMessageFadeTimer = 600;
+					if (m_HelpMessageTimer > m_fHelpMessageTime * 1000.0f || m_HelpMessageQuick && m_HelpMessageTimer > 1500.0f) {
+						m_HelpMessageFadeTimer = 600;
+						m_HelpMessageState = 3;
+					}
+					break;
+				case 2:
+					if (TheCamera.m_WideScreenOn)
+						break;
+
+					m_HelpMessageFadeTimer += 2 * CTimer::GetTimeStepInMilliseconds();
+					if (m_HelpMessageFadeTimer > 0) {
+						m_HelpMessageState = 1;
+						m_HelpMessageFadeTimer = 0;
+					}
+					fAlpha = m_HelpMessageFadeTimer * 0.001f * 225.0f;
+					break;
+				case 3:
+					m_HelpMessageFadeTimer -= 2 * CTimer::GetTimeStepInMilliseconds();
+					if (m_HelpMessageFadeTimer < 0 || TheCamera.m_WideScreenOn) {
+						m_HelpMessageState = 0;
+						m_HelpMessageFadeTimer = 0;
+					}
+					fAlpha = m_HelpMessageFadeTimer * 0.001f * 225.0f;
+					break;
+				case 4:
+					m_HelpMessageFadeTimer -= 2 * CTimer::GetTimeStepInMilliseconds();
+					if (m_HelpMessageFadeTimer < 0) {
+						m_HelpMessageState = 2;
+						m_HelpMessageFadeTimer = 0;
+						CMessages::WideStringCopy(m_HelpMessageToPrint, m_LastHelpMessage, 256);
+					}
+					fAlpha = m_HelpMessageFadeTimer * 0.001f * 225.0f;
+					break;
+				default:
+					break;
+				}
+
+				if (!TheCamera.m_WideScreenOn) {
+					m_HelpMessageTimer += CTimer::GetTimeStepInMilliseconds();
+
+					CFont::SetAlphaFade(fAlpha);
+					CFont::SetCentreOff();
+					CFont::SetPropOn();
+
+					if (CGame::germanGame)
+						CFont::SetScale(SCREEN_SCALE_X(0.52f * 0.85f), SCREEN_SCALE_Y(1.1f * 0.85f));
+#ifdef MORE_LANGUAGES
+					else if (CFont::IsJapanese())
+						CFont::SetScale(SCREEN_SCALE_X(0.52f) * 1.35f, SCREEN_SCALE_Y(1.1f) * 1.25f);
+#endif
+					else
+						CFont::SetScale(SCREEN_SCALE_X(0.52f), SCREEN_SCALE_Y(1.1f));
+
+					CFont::DrawFonts();
+					// CFont::SetColor(CRGBA(175, 175, 175, 255));
+					CFont::SetJustifyOff();
+#ifdef MORE_LANGUAGES
+					if (CFont::IsJapanese())
+						CFont::SetWrapx(SCREEN_SCALE_X(229.0f + 34.0f - 4.0f));
+					else
+#endif
+						CFont::SetWrapx(SCREEN_SCALE_X(200.0f + 34.0f - 4.0f));
+					CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+					CFont::SetBackgroundOn();
+					CFont::SetBackGroundOnlyTextOff();
+					CFont::SetDropShadowPosition(0);
+					CFont::SetColor(CRGBA(175, 175, 175, 255));
+					CFont::SetBackgroundColor(CRGBA(0, 0, 0, fAlpha * 0.9f));
+					CFont::PrintString(SCREEN_SCALE_X(34.0f), SCREEN_SCALE_Y(28.0f + (150.0f - PagerXOffset) * 0.6f), CHud::m_HelpMessageToPrint);
+					CFont::SetAlphaFade(255.0f);
+					CFont::SetWrapx(SCREEN_WIDTH);
+				}
+			}
+		} else
+			m_HelpMessageState = 0;
+
+		/*
 			DrawBigMessage
 		*/
 		// MissionCompleteFailedText
@@ -1058,10 +1184,15 @@ void CHud::Draw()
 				CFont::SetJustifyOff();
 				CFont::SetBackgroundOff();
 				CFont::SetBackGroundOnlyTextOff();
-				CFont::SetScale(SCREEN_SCALE_X(1.8f), SCREEN_SCALE_Y(1.8f));
+				if (CGame::frenchGame || CGame::germanGame) {
+					CFont::SetScale(SCREEN_SCALE_X(1.6f), SCREEN_SCALE_Y(1.8f));
+				} else {
+					CFont::SetScale(SCREEN_SCALE_X(1.8f), SCREEN_SCALE_Y(1.8f));
+				}
 				CFont::SetPropOn();
 				CFont::SetCentreOn();
-				CFont::SetCentreSize(SCREEN_SCALE_X(615.0f));
+				CFont::SetCentreSize(SCREEN_SCALE_X(590.0f));
+				CFont::SetColor(CRGBA(255, 255, 0, BigMessageAlpha[0])); // unused color
 				CFont::SetFontStyle(FONT_HEADING);
 
 				if (BigMessageX[0] >= SCREEN_SCALE_FROM_RIGHT(20.0f)) {
@@ -1084,14 +1215,9 @@ void CHud::Draw()
 					if (BigMessageAlpha[0] > 255.0f)
 						BigMessageAlpha[0] = 255.0f;
 				}
-
-				CFont::SetColor(CRGBA(0, 0, 0, BigMessageAlpha[0]));
-#ifdef FIX_BUGS
-				CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(18.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[0]);
-#else
-				CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(20.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[0]);
-#endif
-
+				CFont::DrawFonts();
+				CFont::SetDropShadowPosition(2);
+				CFont::SetDropColor(CRGBA(0, 0, 0, BigMessageAlpha[0]));
 				CFont::SetColor(CRGBA(BIGMESSAGE_COLOR.r, BIGMESSAGE_COLOR.g, BIGMESSAGE_COLOR.b, BigMessageAlpha[0]));
 				CFont::PrintString(SCREEN_WIDTH / 2, (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(18.0f), m_BigMessage[0]);
 			}
@@ -1131,8 +1257,12 @@ void CHud::Draw()
 				CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(82.0f), m_BigMessage[2]);
 			}
 			else {
-				BigMessageAlpha[2] = 0.0f;
 				BigMessageInUse[2] = 1.0f;
+				BigMessageAlpha[2] = 0.0f;
+				if (CHud::m_VehicleState != 0)
+					CHud::m_VehicleState = 0;
+				if (CHud::m_ZoneState != 0)
+					CHud::m_ZoneState = 0;
 			}
 		}
 		else {
@@ -1143,108 +1273,13 @@ void CHud::Draw()
 
 void CHud::DrawAfterFade()
 {
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
+	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
+
 	if (CTimer::GetIsUserPaused() || CReplay::IsPlayingBack())
 		return;
 
-	if (m_HelpMessage[0]) {
-		if (!CMessages::WideStringCompare(m_HelpMessage, m_LastHelpMessage, 256)) {
-			switch (m_HelpMessageState) {
-			case 0:
-				m_HelpMessageFadeTimer = 0;
-				m_HelpMessageState = 2;
-				m_HelpMessageTimer = 0;
-				CMessages::WideStringCopy(m_HelpMessageToPrint, m_HelpMessage, 256);
-				m_fHelpMessageTime = CMessages::GetWideStringLength(m_HelpMessage) * 0.05f + 3.0f;
-
-				if (TheCamera.m_ScreenReductionPercentage == 0.0f)
-					DMAudio.PlayFrontEndSound(SOUND_HUD_SOUND, 0);
-				break;
-			case 1:
-			case 2:
-			case 3:
-			case 4:
-				m_HelpMessageTimer = 5;
-				m_HelpMessageState = 4;
-				break;
-			default:
-				break;
-			}
-			CMessages::WideStringCopy(m_LastHelpMessage, m_HelpMessage, 256);
-		}
-
-		float fAlpha = 225.0f;
-
-		if (m_HelpMessageState != 0) {
-			switch (m_HelpMessageState) {
-			case 1:
-				fAlpha = 225.0f;
-				m_HelpMessageFadeTimer = 600;
-				if (m_HelpMessageTimer > m_fHelpMessageTime * 1000.0f || m_HelpMessageQuick && m_HelpMessageTimer > 1500.0f) {
-					m_HelpMessageFadeTimer = 600;
-					m_HelpMessageState = 3;
-				}
-				break;
-			case 2:
-				m_HelpMessageFadeTimer += 2 * CTimer::GetTimeStepInMilliseconds();
-				if (m_HelpMessageFadeTimer > 0) {
-					m_HelpMessageState = 1;
-					m_HelpMessageFadeTimer = 0;
-				}
-				fAlpha = m_HelpMessageFadeTimer * 0.001f * 225.0f;
-				break;
-			case 3:
-				m_HelpMessageFadeTimer -= 2 * CTimer::GetTimeStepInMilliseconds();
-				if (m_HelpMessageFadeTimer < 0) {
-					m_HelpMessageState = 0;
-					m_HelpMessageFadeTimer = 0;
-				}
-				fAlpha = m_HelpMessageFadeTimer * 0.001f * 225.0f;
-				break;
-			case 4:
-				m_HelpMessageFadeTimer -= 2 * CTimer::GetTimeStepInMilliseconds();
-				if (m_HelpMessageFadeTimer < 0) {
-					m_HelpMessageState = 2;
-					m_HelpMessageFadeTimer = 0;
-					CMessages::WideStringCopy(m_HelpMessageToPrint, m_LastHelpMessage, 256);
-				}
-				fAlpha = m_HelpMessageFadeTimer * 0.001f * 225.0f;
-				break;
-			default:
-				break;
-			}
-
-			m_HelpMessageTimer += CTimer::GetTimeStepInMilliseconds();
-
-			CFont::SetAlphaFade(fAlpha);
-			CFont::SetCentreOff();
-			CFont::SetPropOn();
-
-			if (CGame::germanGame)
-				CFont::SetScale(SCREEN_SCALE_X(0.52f * 0.85f), SCREEN_SCALE_Y(1.1f * 0.85f));
-#ifdef MORE_LANGUAGES
-			else if (CFont::IsJapanese())
-				CFont::SetScale(SCREEN_SCALE_X(0.52f) * 1.35f, SCREEN_SCALE_Y(1.1f) * 1.25f);
-#endif
-			else
-				CFont::SetScale(SCREEN_SCALE_X(0.52f), SCREEN_SCALE_Y(1.1f));
-
-			CFont::SetColor(CRGBA(175, 175, 175, 255));
-			CFont::SetJustifyOff();
-#ifdef MORE_LANGUAGES
-			if (CFont::IsJapanese())
-				CFont::SetWrapx(SCREEN_SCALE_X(229.0f + 26.0f - 4.0f));
-			else
-#endif
-				CFont::SetWrapx(SCREEN_SCALE_X(200.0f + 26.0f - 4.0f));
-			CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
-			CFont::SetBackgroundOn();
-			CFont::SetBackGroundOnlyTextOff();
-			CFont::SetBackgroundColor(CRGBA(0, 0, 0, fAlpha * 0.9f));
-			CFont::PrintString(SCREEN_SCALE_X(26.0f), SCREEN_SCALE_Y(28.0f + (150.0f - PagerXOffset) * 0.6f), CHud::m_HelpMessageToPrint);
-			CFont::SetAlphaFade(255.0f);
-		}
-	}
-
 	for (int i = 0; i < ARRAY_SIZE(CTheScripts::IntroTextLines); i++) {
 		intro_text_line &line = CTheScripts::IntroTextLines[i];
 		if (line.m_Text[0] != '\0' && !line.m_bTextBeforeFade) {
@@ -1315,12 +1350,10 @@ void CHud::DrawAfterFade()
 		CFont::SetPropOn();
 		CFont::SetCentreSize(SCREEN_SCALE_X(600.0f));
 		CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
-
-		CFont::SetColor(CRGBA(0, 0, 0, 255));
-		CFont::PrintString((SCREEN_WIDTH / 2) + SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[3]);
-
+		CFont::SetDropShadowPosition(2);
+		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
 		CFont::SetColor(ODDJOB_COLOR);
-		CFont::PrintString((SCREEN_WIDTH / 2), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f), m_BigMessage[3]);
+		CFont::PrintString((SCREEN_WIDTH / 2), SCREEN_SCALE_Y(140.0f) - SCREEN_SCALE_Y(16.0f), m_BigMessage[3]);
 	}
 
 	if (!m_BigMessage[1][0] && m_BigMessage[4][0]) {
@@ -1330,13 +1363,11 @@ void CHud::DrawAfterFade()
 		CFont::SetCentreOn();
 		CFont::SetPropOn();
 		CFont::SetCentreSize(SCREEN_SCALE_X(620.0f));
-		CFont::SetColor(CRGBA(0, 0, 0, 255));
 		CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
-
-		CFont::PrintString((SCREEN_WIDTH / 2) - SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f) - SCREEN_SCALE_Y(2.0f), m_BigMessage[4]);
-
+		CFont::SetDropShadowPosition(2);
+		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
 		CFont::SetColor(ODDJOB_COLOR);
-		CFont::PrintString((SCREEN_WIDTH / 2), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f), m_BigMessage[4]);
+		CFont::PrintString((SCREEN_WIDTH / 2), SCREEN_SCALE_Y(140.0f), m_BigMessage[4]);
 	}
 
 	// Oddjob result
@@ -1418,7 +1449,7 @@ void CHud::DrawAfterFade()
 				CFont::SetScale(SCREEN_SCALE_X(1.04f), SCREEN_SCALE_Y(1.6f));
 
 			CFont::SetPropOn();
-			CFont::SetRightJustifyWrap(SCREEN_SCALE_X(-500.0f));
+			CFont::SetRightJustifyWrap(0.0f);
 			CFont::SetRightJustifyOn();
 			CFont::SetFontStyle(FONT_BANK);
 			if (BigMessageX[1] >= SCREEN_SCALE_FROM_RIGHT(20.0f)) {
@@ -1452,6 +1483,7 @@ void CHud::DrawAfterFade()
 			BigMessageAlpha[1] = 0.0f;
 			BigMessageX[1] = -60.0f;
 			BigMessageInUse[1] = 1.0f;
+			m_ZoneState = 0;
 		}
 	}
 	else {
@@ -1541,6 +1573,7 @@ void CHud::Initialise()
 	if (gpRocketSightTex == nil)
 		gpRocketSightTex = RwTextureRead("siterocket", nil);
 
+	m_DrawClock = 1;
 	CounterOnLastFrame = false;
 	m_ItemToFlash = ITEM_NONE;
 	OddJob2Timer = 0;
@@ -1591,6 +1624,7 @@ void CHud::ReInitialise() {
 
 	CounterOnLastFrame = false;
 	m_ItemToFlash = ITEM_NONE;
+	m_DrawClock = 1;
 	OddJob2Timer = 0;
 	OddJob2OffTimer = 0.0f;
 	OddJob2On = 0;
diff --git a/src/render/Hud.h b/src/render/Hud.h
index c6aff654..9106f6fa 100644
--- a/src/render/Hud.h
+++ b/src/render/Hud.h
@@ -86,6 +86,7 @@ public:
 	static wchar m_BigMessage[6][128];
 	static int16 m_ItemToFlash;
 	static bool m_HideRadar;
+	static int32 m_DrawClock;
 
 	// These aren't really in CHud
 	static float BigMessageInUse[6];
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 329a8c9a..bd8545ee 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -922,9 +922,9 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
 
 	// prestep x1 and x2 to next integer y
 	deltaA = CalcNewDelta(&poly[a1], &poly[a2]);
-	xA = deltaA * (ceilf(poly[a1].y) - poly[a1].y) + poly[a1].x;
+	xA = deltaA * (Ceil(poly[a1].y) - poly[a1].y) + poly[a1].x;
 	deltaB = CalcNewDelta(&poly[b1], &poly[b2]);
-	xB = deltaB * (ceilf(poly[b1].y) - poly[b1].y) + poly[b1].x;
+	xB = deltaB * (Ceil(poly[b1].y) - poly[b1].y) + poly[b1].x;
 
 	if(y != yend){
 		if(deltaB < 0.0f && (int)xB < xstart)
@@ -969,7 +969,7 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
 						xstart = poly[b1].x;
 				}while(y == (int)poly[b2].y);
 				deltaB = CalcNewDelta(&poly[b1], &poly[b2]);
-				xB = deltaB * (ceilf(poly[b1].y) - poly[b1].y) + poly[b1].x;
+				xB = deltaB * (Ceil(poly[b1].y) - poly[b1].y) + poly[b1].x;
 				if(deltaB < 0.0f && (int)xB < xstart)
 					xstart = xB;
 			}
@@ -1005,7 +1005,7 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
 						xend = poly[a1].x;
 				}while(y == (int)poly[a2].y);
 				deltaA = CalcNewDelta(&poly[a1], &poly[a2]);
-				xA = deltaA * (ceilf(poly[a1].y) - poly[a1].y) + poly[a1].x;
+				xA = deltaA * (Ceil(poly[a1].y) - poly[a1].y) + poly[a1].x;
 				if(deltaA >= 0.0f && (int)xA > xend)
 					xend = xA;
 			}
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 0fd1e076..13f52334 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -1167,8 +1167,8 @@ CWaterLevel::RenderTransparentWater(void)
 		{
 			if (m_nRenderWaterLayers != 1 && m_nRenderWaterLayers != 6)
 			{
-				float fMaskX = floorf(fCamX / 2.0f) * 2.0f;
-				float fMaskY = floorf(fCamY / 2.0f) * 2.0f;
+				float fMaskX = Floor(fCamX / 2.0f) * 2.0f;
+				float fMaskY = Floor(fCamY / 2.0f) * 2.0f;
 				float fWaterZ = CWaterLevel::ms_aWaterZs[nBlock];
 				float fSectorX = WATER_FROM_SMALL_SECTOR_X(BlockX) - 400.0f;
 				float fSectorY = WATER_FROM_SMALL_SECTOR_Y(BlockY);
@@ -1519,8 +1519,8 @@ CWaterLevel::RenderWavyMask(float fX, float fY, float fZ,
 		return;
 
 #ifndef PC_WATER
-	float fUOffset = fX - (MAX_LARGE_SECTORS * (int32)floorf(fX / MAX_LARGE_SECTORS));
-	float fVOffset = fY - (MAX_LARGE_SECTORS * (int32)floorf(fY / MAX_LARGE_SECTORS));
+	float fUOffset = fX - (MAX_LARGE_SECTORS * (int32)Floor(fX / MAX_LARGE_SECTORS));
+	float fVOffset = fY - (MAX_LARGE_SECTORS * (int32)Floor(fY / MAX_LARGE_SECTORS));
 
 	int32 nSecsX = (int32)((fX - fSectorX) / 2.0f);
 	int32 nSecsY = (int32)((fY - fSectorY) / 2.0f);
@@ -1870,8 +1870,8 @@ CWaterLevel::PreCalcWaterGeometry(void)
 	
 	if ( _IsColideWithBlock(BlockX, BlockY, nBlock) )
 	{
-		float fMaskX = floorf(fCamX / 2.0f) * 2.0f;
-		float fMaskY = floorf(fCamY / 2.0f) * 2.0f;
+		float fMaskX = Floor(fCamX / 2.0f) * 2.0f;
+		float fMaskY = Floor(fCamY / 2.0f) * 2.0f;
 
 		float fSectorX = WATER_FROM_SMALL_SECTOR_X(BlockX) - WATER_X_OFFSET;
 		float fSectorY = WATER_FROM_SMALL_SECTOR_Y(BlockY);
@@ -1994,8 +1994,8 @@ CWaterLevel::PreCalcWavyMask(float fX, float fY, float fZ,
 	if ( COcclusion::IsAABoxOccluded(vecSectorPos, MAX_LARGE_SECTORS, MAX_LARGE_SECTORS, 4.0f) )
 		return false;
 	
-	floorf(fX / MAX_LARGE_SECTORS);
-	floorf(fY / MAX_LARGE_SECTORS);
+	Floor(fX / MAX_LARGE_SECTORS);
+	Floor(fY / MAX_LARGE_SECTORS);
 	
 	RpGeometry    *wavyGeometry  = RpAtomicGetGeometry(ms_pWavyAtomic);
 	RpMorphTarget *wavyMorph     = RpGeometryGetMorphTarget(wavyGeometry, 0);
@@ -2335,7 +2335,7 @@ _GetWindedWave(float fX, float fY)
 	float y = WATER_HUGE_Y(fY);
 	
 	float fWindFactor (CWeather::WindClipped * 0.4f + 0.2f);
-	float fWave = Sin(( (x - floorf(x)) + (y - floorf(y)) ) * TWOPI + fAngle);
+	float fWave = Sin(( (x - Floor(x)) + (y - Floor(y)) ) * TWOPI + fAngle);
 
 	return fWindFactor * fWave;
 }
@@ -2380,8 +2380,8 @@ CWaterLevel::RenderWakeSegment(CVector2D &vecA, CVector2D &vecB, CVector2D &vecC
 		float fVD = (PosD.y / 4) + _TEXTURE_WAKE_ADDV;
 		
 #define MIN4(a, b, c, d) (Min((a), Min((b), Min((c), (d)))))
-		float fMinU = floorf(MIN4(fUA, fUB, fUC, fUD));
-		float fMinV = floorf(MIN4(fVA, fVB, fVC, fVD));
+		float fMinU = Floor(MIN4(fUA, fUB, fUC, fUD));
+		float fMinV = Floor(MIN4(fVA, fVB, fVC, fVD));
 #undef MIN4
 
 		float fZA = _GetWindedWave(PosA.x, PosA.y) + fWakeZ;
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index e1860179..f49f0d42 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -64,10 +64,6 @@ static psGlobalType PsGlobal;
 #undef MAKEPOINTS
 #define MAKEPOINTS(l)		(*((POINTS /*FAR*/ *)&(l)))
 
-#define SAFE_RELEASE(x) { if (x) x->Release(); x = NULL; }
-#define JIF(x) if (FAILED(hr=(x))) \
-	{debug(TEXT("FAILED(hr=0x%x) in ") TEXT(#x) TEXT("\n"), hr); return;}
-
 unsigned long _dwMemAvailPhys;
 RwUInt32 gGameState;
 
@@ -830,9 +826,10 @@ void _InputInitialiseJoys()
 	}
 }
 
-void _InputInitialiseMouse()
+long _InputInitialiseMouse(bool exclusive)
 {
 	glfwSetInputMode(PSGLOBAL(window), GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
+	return 0;
 }
 
 void psPostRWinit(void)
@@ -847,7 +844,7 @@ void psPostRWinit(void)
 	glfwSetJoystickCallback(joysChangeCB);
 
 	_InputInitialiseJoys();
-	_InputInitialiseMouse();
+	_InputInitialiseMouse(false);
 
 	if(!(vm.flags & rwVIDEOMODEEXCLUSIVE))
 		glfwSetWindowSize(PSGLOBAL(window), RsGlobal.maximumWidth, RsGlobal.maximumHeight);
diff --git a/src/skel/platform.h b/src/skel/platform.h
index cbb1be28..7f36d8b7 100644
--- a/src/skel/platform.h
+++ b/src/skel/platform.h
@@ -35,6 +35,7 @@ extern RwBool psInstallFileSystem(void);
 extern RwBool psNativeTextureSupport(void);
 
 extern void _InputTranslateShiftKeyUpDown(RsKeyCodes* rs);
+extern long _InputInitialiseMouse(bool exclusive); // returns HRESULT on Windows actually
 
 extern void HandleExit();
 
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index ed423f30..cd75236c 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -1602,7 +1602,6 @@ RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode)
 	return TRUE;
 }
  
- 
 /*
  *****************************************************************************
  */
@@ -2003,7 +2002,7 @@ WinMain(HINSTANCE instance,
 	
 	if ( _InputInitialise() == S_OK )
 	{
-		_InputInitialiseMouse();
+		_InputInitialiseMouse(false);
 		_InputInitialiseJoys();
 	}
 	
@@ -2542,7 +2541,7 @@ HRESULT _InputInitialise()
 	return S_OK;
 }
 
-HRESULT _InputInitialiseMouse()
+HRESULT _InputInitialiseMouse(bool exclusive)
 {
 	HRESULT hr;
 
@@ -2560,7 +2559,7 @@ HRESULT _InputInitialiseMouse()
 	if( FAILED( hr = PSGLOBAL(mouse)->SetDataFormat( &c_dfDIMouse2 ) ) )
 		return hr;
 	
-	if( FAILED( hr = PSGLOBAL(mouse)->SetCooperativeLevel( PSGLOBAL(window), DISCL_NONEXCLUSIVE | DISCL_FOREGROUND ) ) )
+	if( FAILED( hr = PSGLOBAL(mouse)->SetCooperativeLevel( PSGLOBAL(window), (exclusive ? DISCL_EXCLUSIVE : DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND ) ) )
 		return hr;
 	
 	// Acquire the newly created device
@@ -2848,6 +2847,23 @@ void _InputShutdown()
 	SAFE_RELEASE(PSGLOBAL(dinterface));
 }
 
+void _InputShutdownMouse()
+{
+	if (PSGLOBAL(mouse) == nil)
+		return;
+
+	PSGLOBAL(mouse)->Unacquire();
+	SAFE_RELEASE(PSGLOBAL(mouse));
+}
+
+BOOL _InputMouseNeedsExclusive(void)
+{
+	RwVideoMode vm;
+	RwEngineGetVideoModeInfo(&vm, GcurSelVM);
+
+	return vm.flags & rwVIDEOMODEEXCLUSIVE;
+}
+
 BOOL CALLBACK _InputEnumDevicesCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext )
 {
 	HRESULT hr;
diff --git a/src/skel/win/win.h b/src/skel/win/win.h
index 444e0760..eb32cb72 100644
--- a/src/skel/win/win.h
+++ b/src/skel/win/win.h
@@ -88,13 +88,14 @@ extern LRESULT      CALLBACK
 MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
 
 HRESULT _InputInitialise();
-HRESULT _InputInitialiseMouse();
 HRESULT CapturePad(RwInt32 padID);
 void _InputInitialiseJoys();
 void _InputAddJoyStick(LPDIRECTINPUTDEVICE8 lpDevice, INT num);
 HRESULT _InputAddJoys();
 HRESULT _InputGetMouseState(DIMOUSESTATE2 *state);
 void _InputShutdown();
+void _InputShutdownMouse();
+BOOL _InputMouseNeedsExclusive();
 BOOL CALLBACK _InputEnumDevicesCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext );
 BOOL _InputTranslateKey(RsKeyCodes *rs, UINT flag, UINT key);
 BOOL _InputTranslateShiftKey(RsKeyCodes *rs, UINT key, BOOLEAN bDown);
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index fc856de1..b0dc98ad 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -2523,7 +2523,7 @@ CAutomobile::PreRender(void)
 		if(GetModelIndex() == MI_RCGOBLIN || GetModelIndex() == MI_RCRAIDER)
 			radius = 3.0f;
 		if(GetPosition().z - groundZ < radius)
-			HeliDustGenerate(this, radius-(GetPosition().z - groundZ), groundZ, ceilf(rnd));
+			HeliDustGenerate(this, radius-(GetPosition().z - groundZ), groundZ, Ceil(rnd));
 	}
 
 	CMatrix mat;