1 files changed, 5412 insertions, 16883 deletions

diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 47c29085..0c8e0416 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -3,65 +3,36 @@
 #include "main.h"
 #include "Pools.h"
 #include "Particle.h"
-#include "Stats.h"
-#include "World.h"
 #include "RpAnimBlend.h"
 #include "Bones.h"
 #include "Ped.h"
-#include "Wanted.h"
-#include "PlayerPed.h"
-#include "PedType.h"
-#include "AnimBlendClumpData.h"
 #include "AnimBlendAssociation.h"
 #include "Fire.h"
-#include "Glass.h"
 #include "DMAudio.h"
 #include "General.h"
-#include "SurfaceTable.h"
 #include "VisibilityPlugins.h"
-#include "AudioManager.h"
 #include "HandlingMgr.h"
 #include "Replay.h"
-#include "Camera.h"
 #include "Radar.h"
 #include "PedPlacement.h"
 #include "Shadows.h"
 #include "Weather.h"
 #include "ZoneCull.h"
 #include "Population.h"
-#include "Renderer.h"
-#include "Lights.h"
-#include "PointLights.h"
 #include "Pad.h"
 #include "Phones.h"
-#include "Darkel.h"
-#include "PathFind.h"
-#include "ModelIndices.h"
-#include "FileMgr.h"
-#include "TempColModels.h"
-#include "Pickups.h"
-#include "Train.h"
 #include "TrafficLights.h"
-#include "PedRoutes.h"
-#include "Sprite.h"
-#include "RwHelper.h"
-#include "Font.h"
-#include "Text.h"
 #include "CopPed.h"
 #include "Script.h"
 #include "CarCtrl.h"
 #include "Garages.h"
 #include "WaterLevel.h"
-#include "CarAI.h"
-#include "Zones.h"
-#include "Cranes.h"
 #include "Timecycle.h"
 #include "ParticleObject.h"
 #include "Floater.h"
-#include "Range2D.h"
+#include "Range2D.h" 
 #include "Streaming.h"
 #include "PedAttractor.h"
-#include "Debug.h"
 #include "GameLogic.h"
 #include "Bike.h"
 #include "WindModifiers.h"
@@ -70,71 +41,15 @@
 
 // --MIAMI: file done except TODOs
 
-#define CAN_SEE_ENTITY_ANGLE_THRESHOLD	DEGTORAD(60.0f)
 
 CPed *gapTempPedList[50];
 uint16 gnNumTempPedList;
 
 static CColPoint aTempPedColPts[MAX_COLLISION_POINTS];
 
-// TODO(Miami)
-#define AUDIO_NOT_READY
-
-uint16 nPlayerInComboMove;
-
-RpClump *flyingClumpTemp;
-
-FightMove tFightMoves[NUM_FIGHTMOVES] =
-{
-  { NUM_STD_ANIMS,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_PUNCH_R, 0.2f, 8.f/30.f, 0.0f, 0.3f, 1.0f, HITLEVEL_HIGH, 1, 0 },
-  { ANIM_FIGHT_IDLE,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_FIGHT_SH_F,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_FIGHT_KNEE, 4.f/30.f, 0.2f, 0.0f, 0.6f, 1.0f, HITLEVEL_LOW, 2, 0 },
-  { ANIM_FIGHT_LHOOK, 8.f/30.f, 10.f/30.f, 0.0f, 0.4f, 1.0f, HITLEVEL_HIGH, 3, 0 },
-  { ANIM_FIGHT_JAB, 4.f/30.f, 0.2f, 0.0f, 0.7f, 1.0f, HITLEVEL_HIGH, 3, 0 },
-  { ANIM_FIGHT_PUNCH, 4.f/30.f, 7.f/30.f, 10.f/30.f, 0.4f, 1.0f, HITLEVEL_HIGH, 1, 0 },
-  { ANIM_FIGHT_LONGKICK, 8.f/30.f, 10.f/30.f, 0.0f, 0.5f, 1.0f, HITLEVEL_MEDIUM, 4, 0 },
-  { ANIM_FIGHT_ROUNDHOUSE, 8.f/30.f, 10.f/30.f, 0.0f,  0.6f, 1.0f, HITLEVEL_MEDIUM, 4, 0 },
-  { ANIM_FIGHT_KICK,  8.f/30.f,  10.f/30.f,  0.0f,  0.5f,  1.0f, HITLEVEL_HIGH, 2, 0 },
-  { ANIM_FIGHT_HEAD,  8.f/30.f,  10.f/30.f,  0.0f,  0.5f,  1.0f, HITLEVEL_MEDIUM, 2, 0 },
-  { ANIM_FIGHT_BKICK_L,  8.f/30.f,  10.f/30.f,  0.0f,  0.5f,  1.0f, HITLEVEL_LOW, 2, 0 },
-  { ANIM_FIGHT_BKICK_L,  8.f/30.f,  10.f/30.f,  0.0f,  0.5f,  1.0f, HITLEVEL_LOW, 2, 0 },
-  { ANIM_FIGHT_ELBOW_L,  8.f/30.f,  10.f/30.f,  0.0f,  0.5f,  1.0f, HITLEVEL_MEDIUM, 2, 0 },
-  { ANIM_FIGHT_BKICK_R,  8.f/30.f,  10.f/30.f,  0.0f,  0.5f,  1.0f, HITLEVEL_MEDIUM, 2, 0 },
-  { ANIM_FIGHT_ELBOW_R,  8.f/30.f,  10.f/30.f,  0.0f,  0.5f,  1.0f, HITLEVEL_HIGH, 2, 0 },
-  { ANIM_KICK_FLOOR, 10.f/30.f, 14.f/30.f, 0.0f, 0.4f, 1.0f, HITLEVEL_GROUND, 1, 0 },
-  { ANIM_HIT_FRONT,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_HIT_BACK,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_HIT_RIGHT,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_HIT_LEFT,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_HIT_BODYBLOW,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_HIT_CHEST,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_HIT_HEAD,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_HIT_WALK,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_FLOOR_HIT,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_HIT_BEHIND,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 },
-  { ANIM_WEAPON_FIRE, 4.f/30.f, 7.f/30.f, 10.f/30.f, 0.4f, 1.0f, HITLEVEL_HIGH, 1, 0 },
-  { ANIM_WEAPON_CROUCHFIRE, 4.f/30.f, 7.f/30.f, 10.f/30.f, 0.4f, 1.0f, HITLEVEL_HIGH, 1, 0 },
-  { ANIM_WEAPON_SPECIAL, 4.f / 30.f, 7.f / 30.f, 10.f / 30.f, 0.4f, 1.0f, HITLEVEL_HIGH, 1, 0 },
-  { ANIM_FIGHT2_IDLE,  0.0f,  0.0f,  0.0f,  0.0f,  1.0f, HITLEVEL_NULL, 0, 0 }
-};
-
 uint16 CPed::nThreatReactionRangeMultiplier = 1;
 uint16 CPed::nEnterCarRangeMultiplier = 1;
 
-CVector vecPedCarDoorAnimOffset;
-CVector vecPedCarDoorLoAnimOffset;
-CVector vecPedVanRearDoorAnimOffset;
-CVector vecPedQuickDraggedOutCarAnimOffset;
-CVector vecPedDraggedOutCarAnimOffset;
-CVector vecPedTrainDoorAnimOffset;
-CVector vecPedStdBikeJumpRhsAnimOffset;
-CVector vecPedVespaBikeJumpRhsAnimOffset;
-CVector vecPedHarleyBikeJumpRhsAnimOffset;
-CVector vecPedDirtBikeJumpRhsAnimOffset;
-CVector vecPedBikeKickAnimOffset;
-
 bool CPed::bNastyLimbsCheat;
 bool CPed::bFannyMagnetCheat;
 bool CPed::bPedCheat3;
@@ -148,67 +63,6 @@ void CPed::operator delete(void *p, int handle) { CPools::GetPedPool()->Delete((
 float gfTommyFatness = 1.0f;
 
 // --MIAMI: Done
-CPed::~CPed(void)
-{
-#ifdef USE_CUTSCENE_SHADOW_FOR_PED
-	if ( m_pRTShadow ) delete m_pRTShadow;
-#endif
-	CWorld::Remove(this);
-	if (m_attractor)
-		GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-	CRadar::ClearBlipForEntity(BLIP_CHAR, CPools::GetPedPool()->GetIndex(this));
-	if (InVehicle()){
-		uint8 door_flag = GetCarDoorFlag(m_vehEnterType);
-		if (m_pMyVehicle->pDriver == this)
-			m_pMyVehicle->pDriver = nil;
-		else {
-			// FIX: Passenger counter now being decreased after removing ourself from vehicle.
-			m_pMyVehicle->RemovePassenger(this);
-		}
-		if (m_nPedState == PED_EXIT_CAR || m_nPedState == PED_DRAG_FROM_CAR)
-			m_pMyVehicle->m_nGettingOutFlags &= ~door_flag;
-		bInVehicle = false;
-		m_pMyVehicle = nil;
-	} else if (EnteringCar()) {
-		QuitEnteringCar();
-	}
-	if (m_pFire)
-		m_pFire->Extinguish();
-
-	ClearWeapons();
-	if (bCarPassenger)
-		CPopulation::ms_nTotalCarPassengerPeds--;
-	if (bMiamiViceCop)
-		CPopulation::NumMiamiViceCops--;
-	CPopulation::UpdatePedCount((ePedType)m_nPedType, true);
-	DMAudio.DestroyEntity(m_audioEntityId);
-}
-
-// --MIAMI: Done
-void
-CPed::FlagToDestroyWhenNextProcessed(void)
-{
-	bRemoveFromWorld = true;
-	if (!InVehicle())
-		return;
-	if (m_pMyVehicle->pDriver == this){
-		m_pMyVehicle->pDriver = nil;
-		if (IsPlayer() && m_pMyVehicle->GetStatus() != STATUS_WRECKED)
-			m_pMyVehicle->SetStatus(STATUS_ABANDONED);
-	}else{
-		m_pMyVehicle->RemovePassenger(this);
-	}
-	bInVehicle = false;
-	m_pMyVehicle = nil;
-
-	if (CharCreatedBy == MISSION_CHAR)
-		SetPedState(PED_DEAD);
-	else
-		SetPedState(PED_NONE);
-	m_pVehicleAnim = nil;
-}
-
-// --MIAMI: Done
 CPed::CPed(uint32 pedType) : m_pedIK(this)
 {
 #ifdef USE_CUTSCENE_SHADOW_FOR_PED
@@ -522,2160 +376,98 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 }
 
 // --MIAMI: Done
-int32
-CPed::GiveWeapon(eWeaponType weaponType, uint32 ammo, bool unused)
-{
-	int slot = GetWeaponSlot(weaponType);
-
-	if (m_weapons[slot].m_eWeaponType == weaponType) {
-		GetWeapon(slot).m_nAmmoTotal += ammo;
-		if (weaponType < WEAPONTYPE_TOTALWEAPONS && weaponType > WEAPONTYPE_UNARMED && CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType] >= 0) {
-
-			// Looks like abandoned idea. This block never runs, ms_aMaxAmmoForWeapon is always -1.
-			GetWeapon(slot).m_nAmmoTotal = Min(CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType], GetWeapon(slot).m_nAmmoTotal);
-		} else {
-			GetWeapon(slot).m_nAmmoTotal = Min(99999, GetWeapon(slot).m_nAmmoTotal);
-		}
-		GetWeapon(slot).Reload();
-		if (GetWeapon(slot).m_eWeaponState == WEAPONSTATE_OUT_OF_AMMO && GetWeapon(slot).m_nAmmoTotal > 0)
-			GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
-	} else {
-		if (HasWeaponSlot(slot)) {
-
-			// TODO(Miami): Make an enum for that
-			if (slot == 4 || slot == 5 || slot == 6)
-				ammo += GetWeapon(slot).m_nAmmoTotal;
-
-			RemoveWeaponModel(CWeaponInfo::GetWeaponInfo(GetWeapon(slot).m_eWeaponType)->m_nModelId);
-			GetWeapon(slot).Shutdown();
-		}
-		GetWeapon(slot).Initialise(weaponType, ammo);
-		if (slot == m_currentWeapon && !bInVehicle) {
-			AddWeaponModel(CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_nModelId);
-		}
-	}
-	if (GetWeapon(slot).m_eWeaponState != WEAPONSTATE_OUT_OF_AMMO)
-		GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
-
-	return slot;
-}
-
-static RwObject*
-RemoveAllModelCB(RwObject *object, void *data)
-{
-	RpAtomic *atomic = (RpAtomic*)object;
-	if (CVisibilityPlugins::GetAtomicModelInfo(atomic)) {
-		RpClumpRemoveAtomic(RpAtomicGetClump(atomic), atomic);
-		RpAtomicDestroy(atomic);
-	}
-	return object;
-}
-
-static PedOnGroundState
-CheckForPedsOnGroundToAttack(CPed *attacker, CPed **pedOnGround)
-{
-	PedOnGroundState stateToReturn;
-	float angleToFace;
-	CPed *currentPed = nil;
-	PedState currentPedState;
-	CPed *pedOnTheFloor = nil;
-	CPed *deadPed = nil;
-	CPed *pedBelow = nil;
-	bool foundDead = false;
-	bool foundOnTheFloor = false;
-	bool foundBelow = false;
-	float angleDiff;
-	float distance;
-
-	if (!CGame::nastyGame)
-		return NO_PED;
-
-	for (int currentPedId = 0; currentPedId < attacker->m_numNearPeds; currentPedId++) {
-
-		currentPed = attacker->m_nearPeds[currentPedId];
-
-		CVector posDifference = currentPed->GetPosition() - attacker->GetPosition();
-		distance = posDifference.Magnitude();
-
-		if (distance < 2.0f) {
-			angleToFace = CGeneral::GetRadianAngleBetweenPoints(
-				currentPed->GetPosition().x, currentPed->GetPosition().y,
-				attacker->GetPosition().x, attacker->GetPosition().y);
-
-			angleToFace = CGeneral::LimitRadianAngle(angleToFace);
-			attacker->m_fRotationCur = CGeneral::LimitRadianAngle(attacker->m_fRotationCur);
-
-			angleDiff = Abs(angleToFace - attacker->m_fRotationCur);
-
-			if (angleDiff > PI)
-				angleDiff = 2 * PI - angleDiff;
-
-			currentPedState = currentPed->m_nPedState;
-
-			if (currentPed->OnGroundOrGettingUp()) {
-				if (distance < 2.0f && angleDiff < DEGTORAD(65.0f)) {
-					if (currentPedState == PED_DEAD) {
-						foundDead = 1;
-						if (!deadPed)
-							deadPed = currentPed;
-					} else if (!currentPed->IsPedHeadAbovePos(-0.6f)) {
-						foundOnTheFloor = 1;
-						if (!pedOnTheFloor)
-							pedOnTheFloor = currentPed;
-					}
-				}
-			} else if ((distance < 0.8f && angleDiff < DEGTORAD(75.0f))
-						|| (distance < 1.3f && angleDiff < DEGTORAD(55.0f))
-						|| (distance < 1.7f && angleDiff < DEGTORAD(35.0f))
-						|| (distance < 2.0f && angleDiff < DEGTORAD(30.0f))) {
-
-				// Either this condition or below one was probably returning 4 early in development. See Fight().
-				foundBelow = 1;
-				pedBelow = currentPed;
-				break;
-			} else {
-				if (angleDiff < DEGTORAD(75.0f)) {
-					foundBelow = 1;
-					if (!pedBelow)
-						pedBelow = currentPed;
-				}
-			}
-		}
-	}
-
-	if (foundOnTheFloor) {
-		currentPed = pedOnTheFloor;
-		stateToReturn = PED_ON_THE_FLOOR;
-	} else if (foundDead) {
-		currentPed = deadPed;
-		stateToReturn = PED_DEAD_ON_THE_FLOOR;
-	} else if (foundBelow) {
-		currentPed = pedBelow;
-		stateToReturn = PED_IN_FRONT_OF_ATTACKER;
-	} else {
-		currentPed = nil;
-		stateToReturn = NO_PED;
-	}
-
-	if (pedOnGround)
-		*pedOnGround = currentPed;
-
-	return stateToReturn;
-}
-
-// --MIAMI: Done
-bool
-CPed::IsPlayer(void)
-{
-#if 0
-	return m_nPedType == PEDTYPE_PLAYER1; // Original
-#else
-	// We still have those in enum, so let's also check for them.
-	return m_nPedType == PEDTYPE_PLAYER1 || m_nPedType == PEDTYPE_PLAYER2 ||
-		m_nPedType == PEDTYPE_PLAYER3 || m_nPedType == PEDTYPE_PLAYER4;
-#endif
-}
-
-// --MIAMI: Done
-bool
-CPed::UseGroundColModel(void)
-{
-	return m_nPedState == PED_FALL ||
-		m_nPedState == PED_DIVE_AWAY ||
-		m_nPedState == PED_DIE ||
-		m_nPedState == PED_DEAD;
-}
-
-// --MIAMI: Done
-bool
-CPed::CanSetPedState(void)
-{
-	return !DyingOrDead() && m_nPedState != PED_ARRESTED && !EnteringCar() && m_nPedState != PED_STEAL_CAR;
-}
-
-// --MIAMI: Done
-bool
-CPed::IsPedInControl(void)
-{
-	return m_nPedState <= PED_STATES_NO_AI
-		&& !bIsInTheAir && !bIsLanding
-		&& m_fHealth > 0.0f;
-}
-
-// --MIAMI: Done
-bool
-CPed::CanStrafeOrMouseControl(void)
-{
-#ifdef FREE_CAM
-	if (CCamera::bFreeCam)
-		return false;
-#endif
-	return m_nPedState == PED_NONE || m_nPedState == PED_IDLE || m_nPedState == PED_FLEE_POS || m_nPedState == PED_FLEE_ENTITY ||
-		m_nPedState == PED_ATTACK || m_nPedState == PED_FIGHT || m_nPedState == PED_AIM_GUN || m_nPedState == PED_JUMP || m_nPedState == PED_ANSWER_MOBILE;
-}
-
-// --MIAMI: Done
-void
-CPed::AddWeaponModel(int id)
-{
-	if (id != -1) {
-		if (m_pWeaponModel)
-			RemoveWeaponModel(-1);
-
-		m_pWeaponModel = (RpAtomic*)CModelInfo::GetModelInfo(id)->CreateInstance();
-		CModelInfo::GetModelInfo(id)->AddRef();
-		m_wepModelID = id;
-
-		if (IsPlayer() && id == MI_MINIGUN)
-			((CPlayerPed*)this)->m_pMinigunTopAtomic = (RpAtomic*)CModelInfo::GetModelInfo(MI_MINIGUN2)->CreateInstance();
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::AimGun(void)
-{
-	CVector vector;
-
-	if (IsPlayer() && bIsDucking)
-		m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
-
-	if (m_pSeekTarget) {
-		if (m_pSeekTarget->IsPed()) {
-			((CPed*)m_pSeekTarget)->m_pedIK.GetComponentPosition(vector, PED_MID);
-		} else {
-			vector = m_pSeekTarget->GetPosition();
-		}
-
-		if (!IsPlayer())
-			Say(SOUND_PED_ATTACK);
-
-		bCanPointGunAtTarget = m_pedIK.PointGunAtPosition(vector);
-		if (m_pLookTarget != m_pSeekTarget) {
-			SetLookFlag(m_pSeekTarget, true, true);
-		}
-
-	} else {
-		if (IsPlayer()) {
-			bCanPointGunAtTarget = m_pedIK.PointGunInDirection(m_fLookDirection, ((CPlayerPed*)this)->m_fFPSMoveHeading);
-		} else {
-			bCanPointGunAtTarget = m_pedIK.PointGunInDirection(m_fLookDirection, 0.0f);
-		}
-	}
-}
-
-// --MIAMI: Done
-// III leftover and unused
-void
-CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer)
-{
-	CVector pos2 = CVector(
-		pos.x,
-		pos.y,
-		pos.z + 0.1f
-	);
-
-	if (!IsPlayer() || evenOnPlayer) {
-		++CStats::HeadsPopped;
-
-		// BUG: This condition will always return true. Even fixing it won't work, because these states are unused.
-		// if (m_nPedState != PED_PASSENGER || m_nPedState != PED_TAXI_PASSENGER) {
-			SetDie();
-		// }
-
-		bBodyPartJustCameOff = true;
-		m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 150;
-
-		RemoveBodyPart(PED_HEAD, 0);
-		CParticle::AddParticle(PARTICLE_TEST, pos2,
-			CVector(0.0f, 0.0f, 0.0f), nil, 0.2f, 0, 0, 0, 0);
-
-		if (CEntity::GetIsOnScreen()) {
-			for(int i=0; i < 32; i++) {
-				CParticle::AddParticle(PARTICLE_BLOOD_SMALL,
-					pos2, CVector(0.0f, 0.0f, 0.03f),
-					nil, 0.0f, 0, 0, 0, 0);
-			}
-
-			for (int i = 0; i < 16; i++) {
-				CParticle::AddParticle(PARTICLE_DEBRIS2,
-					pos2,
-					CVector(0.0f, 0.0f, 0.01f),
-					nil, 0.0f, 0, 0, 0, 0);
-			}
-		}
-	}
-}
-
-static RwObject*
-SetPedAtomicVisibilityCB(RwObject* object, void* data)
-{
-	if (data == nil)
-		RpAtomicSetFlags((RpAtomic*)object, 0);
-	return object;
-}
-
-static RwFrame*
-RecurseFrameChildrenVisibilityCB(RwFrame* frame, void* data)
-{
-	RwFrameForAllObjects(frame, SetPedAtomicVisibilityCB, data);
-	RwFrameForAllChildren(frame, RecurseFrameChildrenVisibilityCB, nil);
-	return frame;
-}
-
-// --MIAMI: Done
-void
-CPed::RemoveBodyPart(PedNode nodeId, int8 direction)
-{
-	RwFrame *frame;
-	CVector pos;
-
-	frame = m_pFrames[nodeId]->frame;
-	if (frame) {
-		if (CGame::nastyGame) {
-			if (CEntity::GetIsOnScreen()) {
-				m_pedIK.GetComponentPosition(pos, nodeId);
-				CParticle::AddParticle(PARTICLE_TEST, pos,
-					CVector(0.0f, 0.0f, 0.0f),
-					nil, 0.1f, 0, 0, 0, 0);
-
-				for (int i = 0; i < 16; i++) {
-					CParticle::AddParticle(PARTICLE_BLOOD_SMALL,
-						pos,
-						CVector(0.0f, 0.0f, 0.03f),
-						nil, 0.0f, 0, 0, 0, 0);
-				}
-			}
-			bBodyPartJustCameOff = true;
-			m_bodyPartBleeding = nodeId;
-		}
-	} else {
-		printf("Trying to remove ped component");
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetLookFlag(CEntity *target, bool keepTryingToLook, bool cancelPrevious)
-{
-	if (m_lookTimer < CTimer::GetTimeInMilliseconds() || cancelPrevious) {
-		bIsLooking = true;
-		bIsRestoringLook = false;
-		m_pLookTarget = target;
-		m_pLookTarget->RegisterReference((CEntity**)&m_pLookTarget);
-		m_fLookDirection = 999999.0f;
-		m_lookTimer = 0;
-		bKeepTryingToLook = keepTryingToLook;
-		if (CanUseTorsoWhenLooking()) {
-			m_pedIK.m_flags &= ~CPedIK::LOOKAROUND_HEAD_ONLY;
-		}
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetLookFlag(float direction, bool keepTryingToLook, bool cancelPrevious)
-{
-	if (m_lookTimer < CTimer::GetTimeInMilliseconds() || cancelPrevious) {
-		bIsLooking = true;
-		bIsRestoringLook = false;
-		m_fLookDirection = direction;
-		m_pLookTarget = nil;
-		m_lookTimer = 0;
-		bKeepTryingToLook = keepTryingToLook;
-		if (CanUseTorsoWhenLooking()) {
-			m_pedIK.m_flags &= ~CPedIK::LOOKAROUND_HEAD_ONLY;
-		}
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetLookTimer(int time)
-{
-	if (CTimer::GetTimeInMilliseconds() > m_lookTimer) {
-		m_lookTimer = CTimer::GetTimeInMilliseconds() + time;
-	}
-}
-
-// --MIAMI: Done
-bool
-CPed::OurPedCanSeeThisOne(CEntity *target, bool shootablesDoBlock)
-{
-	CColPoint colpoint;
-	CEntity *ent;
-
-	CVector2D dist = CVector2D(target->GetPosition()) - CVector2D(GetPosition());
-
-	// Check if target is behind ped
-	if (DotProduct2D(dist, CVector2D(GetForward())) < 0.0f)
-		return false;
-
-	// Check if target is too far away
-	if (dist.Magnitude() >= 40.0f)
-		return false;
-
-	// Check line of sight from head
-	return !CWorld::ProcessLineOfSight(GetPosition() + CVector(0.f, 0.f, 1.f), target->GetPosition() + CVector(0.f, 0.f, 1.f),
-		colpoint, ent, true, false, false, shootablesDoBlock, false, false, false, shootablesDoBlock);
-}
-
-// --MIAMI: Done
-void
-CPed::Avoid(void)
-{
-	CPed *nearestPed;
-
-	if(m_pedStats->m_temper > m_pedStats->m_fear && m_pedStats->m_temper > 50)
-		return;
-
-	if (CTimer::GetTimeInMilliseconds() > m_nPedStateTimer) {
-
-		if (m_nMoveState != PEDMOVE_NONE && m_nMoveState != PEDMOVE_STILL) {
-			nearestPed = m_nearPeds[0];
-
-			if (nearestPed && nearestPed->m_nPedState != PED_DEAD && nearestPed != m_pSeekTarget && nearestPed != m_pedInObjective) {
-
-				// Check if this ped wants to avoid the nearest one
-				if (CPedType::GetAvoid(m_nPedType) & CPedType::GetFlag(nearestPed->m_nPedType)) {
-
-					// Further codes checks whether the distance between us and ped will be equal or below 1.0, if we walk up to him by 1.25 meters.
-					// If so, we want to avoid it, so we turn our body 45 degree and look to somewhere else.
-
-					// Game converts from radians to degress and back again here, doesn't make much sense
-					CVector2D forward(-Sin(m_fRotationCur), Cos(m_fRotationCur));
-					forward.Normalise();	// this is kinda pointless
-
-					// Move forward 1.25 meters
-					CVector2D testPosition = CVector2D(GetPosition()) + forward*1.25f;
-
-					// Get distance to ped we want to avoid
-					CVector2D distToPed = CVector2D(nearestPed->GetPosition()) - testPosition;
-
-					if (distToPed.Magnitude() <= 1.0f && OurPedCanSeeThisOne((CEntity*)nearestPed)) {
-						m_nPedStateTimer = CTimer::GetTimeInMilliseconds()
-							+ 500 + (m_randomSeed + 3 * CTimer::GetFrameCounter())
-							% 1000 / 5;
-
-						m_fRotationDest += DEGTORAD(45.0f);
-						if (!bIsLooking) {
-							SetLookFlag(nearestPed, false);
-							SetLookTimer(CGeneral::GetRandomNumberInRange(500, 800));
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-
-// --MIAMI: Done
-void
-CPed::ClearAimFlag(void)
-{
-	if (bIsAimingGun) {
-		bIsAimingGun = false;
-		bIsRestoringGun = true;
-		m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
-		m_lookTimer = 0;
-	}
-
-	if (IsPlayer())
-		((CPlayerPed*)this)->m_fFPSMoveHeading = 0.0f;
-}
-
-// --MIAMI: Done
-void
-CPed::ClearLookFlag(void) {
-	if (bIsLooking) {
-		bIsLooking = false;
-		bIsRestoringLook = true;
-		bShakeFist = false;
-
-		if (CanUseTorsoWhenLooking())
-			m_pedIK.m_flags &= ~CPedIK::LOOKAROUND_HEAD_ONLY;
-
-		if (IsPlayer())
-			m_lookTimer = CTimer::GetTimeInMilliseconds() + 2000;
-		else
-			m_lookTimer = CTimer::GetTimeInMilliseconds() + 4000;
-
-		if (m_nPedState == PED_LOOK_HEADING || m_nPedState == PED_LOOK_ENTITY) {
-			ClearLook();
-		}
-	}
-}
-
-// --MIAMI: Done
-bool
-CPed::IsPedHeadAbovePos(float zOffset)
-{
-	return zOffset + GetPosition().z < GetNodePosition(PED_HEAD).z;
-}
-
-// --MIAMI: Done
-void
-CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg)
-{
-	CPed *ped = (CPed*)arg;
-	CWeaponInfo *weapon = CWeaponInfo::GetWeaponInfo(ped->GetWeapon()->m_eWeaponType);
-	
-	if (ped->DyingOrDead())
-		return;
-
-	if (ped->bIsDucking && ped->bCrouchWhenShooting) {
-		CAnimBlendAssociation *crouchFireAssoc = nil;
-		if (!!weapon->m_bCrouchFire) {
-			crouchFireAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), GetCrouchFireAnim(weapon));
-		}
-		if (!!weapon->m_bReload && reloadAssoc) {
-			if (reloadAssoc->animId == GetCrouchReloadAnim(weapon) && !crouchFireAssoc) {
-				CAnimBlendAssociation *crouchAssoc = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_WEAPON_CROUCH, 8.0f);
-				crouchAssoc->SetCurrentTime(crouchAssoc->hierarchy->totalLength);
-				crouchAssoc->flags &= ~ASSOC_RUNNING;
-			}
-		}
-	} else if (weapon->m_bReloadLoop2Start && ped->bIsAttacking) {
-		CAnimBlendAssociation *fireAssoc =
-			CAnimManager::BlendAnimation(ped->GetClump(), weapon->m_AnimToPlay, GetPrimaryFireAnim(weapon), 8.0f);
-		fireAssoc->SetFinishCallback(FinishedAttackCB, ped);
-		fireAssoc->SetRun();
-		if (fireAssoc->currentTime == reloadAssoc->hierarchy->totalLength)
-			fireAssoc->SetCurrentTime(Max(weapon->m_fAnimLoopStart - 0.04f, 0.0f));
-		else if (fireAssoc->currentTime < weapon->m_fAnimLoopStart)
-			fireAssoc->SetCurrentTime(Max(weapon->m_fAnimLoopStart - 0.04f, 0.0f));
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
-{
-	CAnimBlendAssociation *newAnim, *reloadAnimAssoc = nil;
-	CPed *ped = (CPed*)arg;
-	CWeaponInfo *currentWeapon = CWeaponInfo::GetWeaponInfo(ped->GetWeapon()->m_eWeaponType);
-
-	if (ped->m_nPedState != PED_ATTACK) {
-		if (ped->bIsDucking && ped->IsPedInControl()) {
-			if (currentWeapon->m_bReload) {
-				reloadAnimAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), GetCrouchReloadAnim(currentWeapon));
-			}
-			if (currentWeapon->m_bCrouchFire && attackAssoc) {
-				if (attackAssoc->animId == GetCrouchFireAnim(currentWeapon) && !reloadAnimAssoc) {
-					newAnim = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_WEAPON_CROUCH, 8.0f);
-					newAnim->SetCurrentTime(newAnim->hierarchy->totalLength);
-					newAnim->flags &= ~ASSOC_RUNNING;
-				}
-			}
-		}
-	} else if (attackAssoc && attackAssoc->animId == ANIM_THROWABLE_START_THROW && currentWeapon->m_AnimToPlay == ASSOCGRP_THROW) {
-		if ((!ped->IsPlayer() || ((CPlayerPed*)ped)->m_bHaveTargetSelected) && ped->IsPlayer()) {
-			attackAssoc->blendDelta = -1000.0f;
-			newAnim = CAnimManager::AddAnimation(ped->GetClump(), currentWeapon->m_AnimToPlay, ANIM_THROWABLE_THROWU);
-		} else {
-			attackAssoc->blendDelta = -1000.0;
-			newAnim = CAnimManager::AddAnimation(ped->GetClump(), currentWeapon->m_AnimToPlay, ANIM_THROWABLE_THROW);
-		}
-		newAnim->SetFinishCallback(FinishedAttackCB, ped);
-	} else if (ped->bIsDucking && ped->bCrouchWhenShooting) {
-		if (currentWeapon->m_bReload) {
-			reloadAnimAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), GetCrouchReloadAnim(currentWeapon));
-		}
-		if (currentWeapon->m_bCrouchFire && attackAssoc) {
-			if (attackAssoc->animId == GetCrouchFireAnim(currentWeapon) && !reloadAnimAssoc) {
-				newAnim = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_WEAPON_CROUCH, 8.0f);
-				newAnim->SetCurrentTime(newAnim->hierarchy->totalLength);
-				newAnim->flags &= ~ASSOC_RUNNING;
-			}
-		}
-
-		if (!ped->bIsAttacking)
-			ped->ClearAttack();
-
-	} else if (GetSecondFireAnim(currentWeapon) && ped->bIsAttacking && currentWeapon->m_AnimToPlay != ASSOCGRP_THROW) {
-		AnimationId groundAnim = GetFireAnimGround(currentWeapon);
-		CAnimBlendAssociation *groundAnimAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), groundAnim);
-		if (!(groundAnimAssoc && (groundAnimAssoc->blendAmount > 0.95f || groundAnimAssoc->blendDelta > 0.0f))) {
-			if (attackAssoc && attackAssoc->animId == ANIM_MELEE_ATTACK) {
-				newAnim = CAnimManager::BlendAnimation(
-					ped->GetClump(), currentWeapon->m_AnimToPlay, GetSecondFireAnim(currentWeapon), 8.0f);
-			} else {
-				newAnim = CAnimManager::BlendAnimation(
-					ped->GetClump(), currentWeapon->m_AnimToPlay, ANIM_MELEE_ATTACK, 8.0f);
-			}
-			newAnim->SetFinishCallback(FinishedAttackCB, ped);
-		}
-	} else {
-		if (attackAssoc && attackAssoc->animId == ANIM_MELEE_ATTACK && currentWeapon->m_AnimToPlay == ASSOCGRP_UNARMED) {
-			attackAssoc->blendDelta = -8.0f;
-			attackAssoc->flags |= ASSOC_DELETEFADEDOUT;
-			ped->ClearAttack();
-			return;
-		}
-		if (attackAssoc) {
-			if (currentWeapon->m_AnimToPlay == ASSOCGRP_THROW) {
-				if ((attackAssoc->animId == ANIM_THROWABLE_THROW || attackAssoc->animId == ANIM_THROWABLE_THROWU) && ped->GetWeapon()->m_nAmmoTotal > 0) {
-					ped->RemoveWeaponModel(currentWeapon->m_nModelId);
-					ped->AddWeaponModel(currentWeapon->m_nModelId);
-				}
-			}
-		}
-
-		if (!ped->bIsAttacking)
-			ped->ClearAttack();
-	}
-}
-
-// --MIAMI: Done except commented things
-void
-CPed::Attack(void)
+CPed::~CPed(void)
 {
-	CAnimBlendAssociation *weaponAnimAssoc;
-	int32 weaponAnim;
-	eWeaponType ourWeaponType;
-	float weaponAnimTime;
-	eWeaponFire ourWeaponFire;
-	float animLoopEnd;
-	CWeaponInfo *ourWeapon;
-	bool attackShouldContinue;
-	CAnimBlendAssociation *reloadAnimAssoc;
-	CAnimBlendAssociation *throwAssoc;
-	float delayBetweenAnimAndFire;
-	float animLoopStart;
-	CVector firePos;
-
-	ourWeaponType = GetWeapon()->m_eWeaponType;
-	ourWeapon = CWeaponInfo::GetWeaponInfo(ourWeaponType);
-	ourWeaponFire = ourWeapon->m_eWeaponFire;
-	weaponAnimAssoc = nil;
-	attackShouldContinue = bIsAttacking;
-	reloadAnimAssoc = nil;
-	throwAssoc = nil;
-	animLoopStart = ourWeapon->m_fAnimLoopStart;
-	animLoopEnd = ourWeapon->m_fAnimLoopEnd;
-	delayBetweenAnimAndFire = ourWeapon->m_fAnimFrameFire;
-	weaponAnim = ourWeapon->m_AnimToPlay;
-
-	if (bIsDucking) {
-		if (!!ourWeapon->m_bCrouchFire && bCrouchWhenShooting) {
-			weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(ourWeapon));
-			if (weaponAnimAssoc) {
-				animLoopStart = ourWeapon->m_fAnim2LoopStart;
-				animLoopEnd = ourWeapon->m_fAnim2LoopEnd;
-				delayBetweenAnimAndFire = ourWeapon->m_fAnim2FrameFire;
-			}
-		}
-	} else {
-		AnimationId anim = GetFireAnimNotDucking(ourWeapon);
-		weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), anim);
-		if (anim == ANIM_WEAPON_FIRE_3RD && weaponAnimAssoc) {
-			animLoopStart = 11.f/30.f;
-			animLoopEnd = 19.f/30.f;
-			delayBetweenAnimAndFire = 14.f/30.f;
-		}
-	}
-
-	if (ourWeapon->m_bReload) {
-		reloadAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetReloadAnim(ourWeapon));
-	}
-
-	if (!!ourWeapon->m_bReload && !reloadAnimAssoc)  {
-		reloadAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchReloadAnim(ourWeapon));
-	}
-
-	if ( reloadAnimAssoc && reloadAnimAssoc->IsRunning() ) {
-		if (!IsPlayer() || ((CPlayerPed*)this)->m_bHaveTargetSelected)
-			ClearAttack();
-		return;
-	}
-
-	if ( reloadAnimAssoc ) {
-		reloadAnimAssoc->flags |= ASSOC_DELETEFADEDOUT;
-		if ( reloadAnimAssoc->blendDelta >= 0.0f )
-			reloadAnimAssoc->blendDelta = -8.0f;
-	}
-
-	if (!!ourWeapon->m_bThrow)  {
-		throwAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_THROWABLE_START_THROW);
-	}
-
-	if ( CTimer::GetTimeInMilliseconds() < m_shootTimer )
-		attackShouldContinue = true;
-
-	bool meleeAttackStarted = false;
-	if ( !weaponAnimAssoc ) {
-		if (!!ourWeapon->m_bPartialAttack) {
-			weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_MELEE_ATTACK_START);
-			if ( weaponAnimAssoc ) {
-				if ( IsPlayer() )
-					meleeAttackStarted = true;
-
-				switch ( ourWeapon->m_AnimToPlay ) {
-					case ASSOCGRP_UNARMED:
-					case ASSOCGRP_SCREWDRIVER:
-					case ASSOCGRP_KNIFE:
-					case ASSOCGRP_BASEBALLBAT:
-					case ASSOCGRP_GOLFCLUB:
-					case ASSOCGRP_CHAINSAW:
-						delayBetweenAnimAndFire = 0.2f;
-						animLoopStart = 0.1f;
-						break;
-					default:
-						break;
-				}
-				animLoopEnd = 99.9f;
-			}
-		}
-	}
-	if (!weaponAnimAssoc) {
-		if (!!ourWeapon->m_bUse2nd) {
-			weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetSecondFireAnim(ourWeapon));
-			if (weaponAnimAssoc) {
-				animLoopStart = ourWeapon->m_fAnim2LoopStart;
-				animLoopEnd = ourWeapon->m_fAnim2LoopEnd;
-				delayBetweenAnimAndFire = ourWeapon->m_fAnim2FrameFire;
-			}
-		}
-	}
-	if (!weaponAnimAssoc) {
-		weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetFireAnimGround(ourWeapon));
-		if (weaponAnimAssoc) {
-			animLoopStart = ourWeapon->m_fAnim2LoopStart;
-			animLoopEnd = ourWeapon->m_fAnim2LoopEnd;
-			delayBetweenAnimAndFire = ourWeapon->m_fAnim2FrameFire;
-		}
-	}
-
-	if (!weaponAnimAssoc) {
-		if (!throwAssoc) {
-			if (attackShouldContinue) {
-				if (ourWeaponFire != WEAPON_FIRE_PROJECTILE || !IsPlayer() || ((CPlayerPed*)this)->m_bHaveTargetSelected) {
-					if (bCrouchWhenShooting && bIsDucking && !!ourWeapon->m_bCrouchFire) {
-						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, GetCrouchFireAnim(ourWeapon), 8.0f);
-
-					} else if(GetSecondFireAnim(ourWeapon) && CGeneral::GetRandomNumber() & 1){
-						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, GetSecondFireAnim(ourWeapon), 8.0f);
-
-					} else if (!CGame::nastyGame || (!ourWeapon->m_bGround2nd && !ourWeapon->m_bGround3rd) ||
-						ourWeaponFire != WEAPON_FIRE_MELEE || CheckForPedsOnGroundToAttack(this, nil) < PED_ON_THE_FLOOR) {
-
-						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, GetFireAnimNotDucking(ourWeapon), 8.0f);
-
-					} else {
-						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, GetFireAnimGround(ourWeapon, false), 8.0f);
-					}
-
-					weaponAnimAssoc->SetFinishCallback(FinishedAttackCB, this);
-					weaponAnimAssoc->SetRun();
-
-					if (weaponAnimAssoc->currentTime == weaponAnimAssoc->hierarchy->totalLength)
-						weaponAnimAssoc->SetCurrentTime(0.0f);
-
-					if (IsPlayer()) {
-						((CPlayerPed*)this)->m_fAttackButtonCounter = 0.0f;
-						((CPlayerPed*)this)->m_bHaveTargetSelected = false;
-					}
-				}
-			} else
-				FinishedAttackCB(nil, this);
-
-		}
-		return;
-	}
-
-	if (meleeAttackStarted && IsPlayer()) {
-		if (((CPlayerPed*)this)->m_bHaveTargetSelected || ((CPlayerPed*)this)->m_fMoveSpeed < 0.5f) {
-			weaponAnimAssoc->SetRun();
-		} else {
-			if (weaponAnimAssoc->currentTime > animLoopStart && weaponAnimAssoc->currentTime - weaponAnimAssoc->timeStep <= animLoopStart)
-				weaponAnimAssoc->flags &= ~ASSOC_RUNNING;
-		}
-	}
-
-	float animStart = ourWeapon->m_fAnimLoopStart * 0.4f;
-	weaponAnimTime = weaponAnimAssoc->currentTime;
-	if (weaponAnimTime > animStart && weaponAnimTime - weaponAnimAssoc->timeStep <= animStart) {
-		if (!bIsDucking && !(m_nPedType == PEDTYPE_COP && ourWeapon->m_bCop3rd && weaponAnimAssoc->animId == ANIM_WEAPON_FIRE_3RD) && ourWeapon->m_bCanAimWithArm)
-			m_pedIK.m_flags |= CPedIK::AIMS_WITH_ARM;
-		else
-			m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
-	}
-
-	if (ourWeaponType != WEAPONTYPE_CHAINSAW
-		|| !meleeAttackStarted && delayBetweenAnimAndFire - 0.5f >= weaponAnimAssoc->currentTime
-		|| weaponAnimAssoc->currentTime - weaponAnimAssoc->timeStep > delayBetweenAnimAndFire) {
-
-		if (ourWeaponType == WEAPONTYPE_CHAINSAW) {
-			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_ATTACK, 0.0f);
-		} else if (weaponAnimTime <= delayBetweenAnimAndFire || weaponAnimTime - weaponAnimAssoc->timeStep > delayBetweenAnimAndFire || !weaponAnimAssoc->IsRunning()) {
-			if (weaponAnimAssoc->speed < 1.0f)
-				weaponAnimAssoc->speed = 1.0f;
-
-		} else {
-			firePos = ourWeapon->m_vecFireOffset;
-
-			if (ourWeaponType != WEAPONTYPE_KATANA && ourWeaponType != WEAPONTYPE_CHAINSAW) {
-				if (ourWeapon->m_eWeaponFire != WEAPON_FIRE_MELEE) {
-					TransformToNode(firePos, (weaponAnimAssoc->animId == ANIM_MELEE_ATTACK_2ND && ourWeapon->m_AnimToPlay == ASSOCGRP_UNARMED) ? PED_FOOTR : PED_HANDR);
-				} else {
-					firePos = GetMatrix() * firePos;
-				}
-			} else {
-				if (weaponAnimAssoc->animId == ANIM_MELEE_ATTACK_2ND)
-					firePos.z = 0.7f * ourWeapon->m_fRadius - 1.0f;
-
-				firePos = GetMatrix() * firePos;
-			}
-			
-			GetWeapon()->Fire(this, &firePos);
-
-			if (ourWeaponType == WEAPONTYPE_MOLOTOV || ourWeaponType == WEAPONTYPE_GRENADE || ourWeaponType == WEAPONTYPE_DETONATOR_GRENADE ||
-				ourWeaponType == WEAPONTYPE_TEARGAS) {
-				RemoveWeaponModel(ourWeapon->m_nModelId);
-			}
-			if (!GetWeapon()->m_nAmmoTotal && ourWeaponFire != WEAPON_FIRE_MELEE && FindPlayerPed() != this) {
-				SelectGunIfArmed();
-			}
-
-			if (GetWeapon()->m_eWeaponState == WEAPONSTATE_MELEE_MADECONTACT) {
-				int damagerType = ENTITY_TYPE_NOTHING;
-				if (m_pDamageEntity && (m_fDamageImpulse == 0.0f || !m_pDamageEntity->IsBuilding())) {
-					damagerType = m_pDamageEntity->GetType();
-				}
-				switch (ourWeapon->m_AnimToPlay) {
-					case ASSOCGRP_UNARMED:
-						if (weaponAnimAssoc->animId == ANIM_MELEE_ATTACK || weaponAnimAssoc->animId == ANIM_MELEE_ATTACK_START) {
-#ifdef AUDIO_NOT_READY
-							DMAudio.PlayOneShot(m_audioEntityId, SOUND_FIGHT_46, 0.0f);
-#else
-							DMAudio.PlayOneShot(m_audioEntityId, SOUND_FIGHT_46, (damagerType | (ourWeaponType << 8)));
-#endif
-						}
-						break;
-					case ASSOCGRP_KNIFE:
-					case ASSOCGRP_BASEBALLBAT:
-					case ASSOCGRP_GOLFCLUB:
-					case ASSOCGRP_CHAINSAW:
-#ifdef AUDIO_NOT_READY
-						DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_BAT_ATTACK, 1.0f);
-#else
-						DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_BAT_ATTACK, (damagerType | (ourWeaponType << 8)));
-#endif
-						break;
-					default:
-						break;
-				}
-
-				if (bIsAttacking || CTimer::GetTimeInMilliseconds() < m_shootTimer) {
-					weaponAnimAssoc->callbackType = 0;
-				}
-			}
-
-			attackShouldContinue = false;
-		}
-	} else {
-		CVector firePos = ourWeapon->m_vecFireOffset;
-
-		if (weaponAnimAssoc->animId == ANIM_MELEE_ATTACK_2ND)
-			firePos.z = 0.7f * ourWeapon->m_fRadius - 1.0f;
-
-		firePos = GetMatrix() * firePos;
-		GetWeapon()->Fire(this, &firePos);
-		if (GetWeapon()->m_eWeaponState == WEAPONSTATE_MELEE_MADECONTACT) {
-			int damagerType = ENTITY_TYPE_PED;
-			if (m_pDamageEntity)
-				damagerType = m_pDamageEntity->GetType();
-
-			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_MADECONTACT, (float)damagerType);
-			if (IsPlayer()) {
-				CPad::GetPad(0)->StartShake(240, 180);
-			}
-		} else {
-			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_IDLE, 0.0f);
-			if (IsPlayer()) {
-				CPad::GetPad(0)->StartShake(240, 90);
-			}
-		}
-		attackShouldContinue = false;
-	}
-
-	if (ourWeapon->m_eWeaponFire == WEAPON_FIRE_INSTANT_HIT && ourWeapon->m_AnimToPlay == ASSOCGRP_SHOTGUN) {
-		weaponAnimTime = weaponAnimAssoc->currentTime;
-		firePos = ourWeapon->m_vecFireOffset;
-
-		if (weaponAnimTime > 1.0f && weaponAnimTime - weaponAnimAssoc->timeStep <= 1.0f && weaponAnimAssoc->IsRunning()) {
-			TransformToNode(firePos, PED_HANDR);
-
-			CVector gunshellPos(
-				firePos.x - 0.6f * GetForward().x,
-				firePos.y - 0.6f * GetForward().y,
-				firePos.z - 0.15f * GetUp().z
-			);
-
-			CVector2D gunshellRot(
-				GetRight().x,
-				GetRight().y
-			);
-
-			gunshellRot.Normalise();
-			GetWeapon()->AddGunshell(this, gunshellPos, gunshellRot, 0.025f);
-		}
-	}
-
-	// TODO(Miami): CSpecialFX::AddWeaponStreak
-
-	// Anim breakout on running
-	if (IsPlayer()) {
-		if (CPad::GetPad(0)->GetSprint()) {
-			if (!attackShouldContinue && weaponAnimAssoc->currentTime > ourWeapon->m_fAnimBreakout) {
-				weaponAnimAssoc->blendDelta = -4.0f;
-				FinishedAttackCB(nil, this);
-				return;
-			}
-		}
-	}
-
-	weaponAnimTime = weaponAnimAssoc->currentTime;
-
-	// Anim loop end, either start the loop again or finish the attack
-	if (weaponAnimTime > animLoopEnd || !weaponAnimAssoc->IsRunning() && ourWeaponFire != WEAPON_FIRE_PROJECTILE) {
-		if (GetWeapon()->m_eWeaponState == WEAPONSTATE_RELOADING) {
-			if (ourWeapon->m_bReload && !reloadAnimAssoc) {
-				if (!CWorld::Players[CWorld::PlayerInFocus].m_bFastReload) {
-					CAnimBlendAssociation *newReloadAssoc;
-					if (bIsDucking) {
-						newReloadAssoc = CAnimManager::BlendAnimation(
-							GetClump(), ourWeapon->m_AnimToPlay,
-							GetCrouchReloadAnim(ourWeapon),
-							8.0f);
-					} else {
-						newReloadAssoc = CAnimManager::BlendAnimation(
-							GetClump(), ourWeapon->m_AnimToPlay,
-							GetReloadAnim(ourWeapon),
-							8.0f);
-					}
-					newReloadAssoc->SetFinishCallback(FinishedReloadCB, this);
-				}
-				ClearLookFlag();
-				ClearAimFlag();
-				bIsAttacking = false;
-				bIsPointingGunAt = false;
-				m_shootTimer = CTimer::GetTimeInMilliseconds();
-#ifdef AUDIO_NOT_READY
-				DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_AK47_BULLET_ECHO, 0.0f);
-#else
-				DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_AK47_BULLET_ECHO, GetWeapon()->m_eWeaponType);
-#endif
-				return;
-			}
-		}
-		if (weaponAnimTime - 2.0f * weaponAnimAssoc->timeStep <= animLoopEnd
-			&& (bIsAttacking || CTimer::GetTimeInMilliseconds() < m_shootTimer)
-			&& (GetWeapon()->m_eWeaponState != WEAPONSTATE_RELOADING
-				|| GetWeapon()->m_eWeaponType == WEAPONTYPE_MINIGUN)) {
-
-			PedOnGroundState pedOnGroundState;
-			if (ourWeapon->m_eWeaponFire == WEAPON_FIRE_MELEE &&
-				(CGame::nastyGame && ((pedOnGroundState = CheckForPedsOnGroundToAttack(this, nil)) > PED_IN_FRONT_OF_ATTACKER)
-				|| ourWeaponType == WEAPONTYPE_BASEBALLBAT && pedOnGroundState == NO_PED && bIsStanding && m_pCurSurface && m_pCurSurface->IsVehicle())) {
-
-				AnimationId fireAnim = GetFireAnimGround(ourWeapon, false);
-				if (weaponAnimAssoc->animId == fireAnim)
-					weaponAnimAssoc->SetCurrentTime(0.1f);
-				else {
-					if (fireAnim) {
-						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, fireAnim, 8.0f);
-					} else {
-						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_KICK_FLOOR, 8.0f);
-					}
-				}
-				weaponAnimAssoc->SetFinishCallback(FinishedAttackCB, this);
-			} else if (!!ourWeapon->m_bUse2nd) {
-				if (weaponAnimAssoc->animId == GetSecondFireAnim(ourWeapon)) {
-					weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, ANIM_WEAPON_FIRE, 8.0f);
-				} else {
-					weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, GetSecondFireAnim(ourWeapon), 8.0f);
-				}
-				weaponAnimAssoc->SetFinishCallback(FinishedAttackCB, this);
-			} else {
-				weaponAnimAssoc->SetCurrentTime(animLoopStart);
-				weaponAnimAssoc->SetRun();
-			}
-		}
-	} else if (IsPlayer() && m_pPointGunAt && bIsAimingGun && GetWeapon()->m_eWeaponState != WEAPONSTATE_RELOADING) {
-		weaponAnimAssoc->SetCurrentTime(animLoopEnd);
-		weaponAnimAssoc->flags &= ~ASSOC_RUNNING;
-		SetPointGunAt(m_pPointGunAt);
-	} else {
-		ClearAimFlag();
-
-		// Echoes of bullets, at the end of the attack. (Bug: doesn't play while reloading)
-		if (weaponAnimAssoc->currentTime - weaponAnimAssoc->timeStep < animLoopEnd) {
-
-#ifdef AUDIO_NOT_READY
-			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_AK47_BULLET_ECHO, 0.0f);
-#else
-			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_AK47_BULLET_ECHO, ourWeaponType);
+#ifdef USE_CUTSCENE_SHADOW_FOR_PED
+	if ( m_pRTShadow ) delete m_pRTShadow;
 #endif
+	CWorld::Remove(this);
+	if (m_attractor)
+		GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+	CRadar::ClearBlipForEntity(BLIP_CHAR, CPools::GetPedPool()->GetIndex(this));
+	if (InVehicle()){
+		uint8 door_flag = GetCarDoorFlag(m_vehEnterType);
+		if (m_pMyVehicle->pDriver == this)
+			m_pMyVehicle->pDriver = nil;
+		else {
+			// FIX: Passenger counter now being decreased after removing ourself from vehicle.
+			m_pMyVehicle->RemovePassenger(this);
 		}
-
-		// Fun fact: removing this part leds to reloading flamethrower
-		if (ourWeaponType == WEAPONTYPE_FLAMETHROWER && weaponAnimAssoc->IsRunning()) {
-			weaponAnimAssoc->flags |= ASSOC_DELETEFADEDOUT;
-			weaponAnimAssoc->flags &= ~ASSOC_RUNNING;
-			weaponAnimAssoc->blendDelta = -4.0f;
-		}
-	}
-
-	if (weaponAnimAssoc->currentTime > delayBetweenAnimAndFire)
-		attackShouldContinue = false;
-
-	bIsAttacking = attackShouldContinue;
-}
-
-// --MIAMI: Done
-void
-CPed::RemoveWeaponModel(int modelId)
-{
-	// modelId is not used!! This function just removes the current weapon.
-	if(m_pWeaponModel){
-		if (modelId == -1
-			|| CVisibilityPlugins::GetAtomicModelInfo(m_pWeaponModel) == CModelInfo::GetModelInfo(modelId)) {
-			CVisibilityPlugins::GetAtomicModelInfo(m_pWeaponModel)->RemoveRef();
-			RwFrame* frm = RpAtomicGetFrame(m_pWeaponModel);
-			RpAtomicDestroy(m_pWeaponModel);
-			RwFrameDestroy(frm);
-			m_pWeaponModel = nil;
-		}
-	}
-
-	if (IsPlayer() && (modelId == -1 || modelId == MI_MINIGUN)) {
-		RpAtomic* &atm = ((CPlayerPed*)this)->m_pMinigunTopAtomic;
-		if (atm) {
-			RwFrame *frm = RpAtomicGetFrame(atm);
-			RpAtomicDestroy(atm);
-			RwFrameDestroy(frm);
-			atm = nil;
-		}
-	}
-	m_wepModelID = -1;
-}
-
-// --MIAMI: Done
-void
-CPed::SetCurrentWeapon(eWeaponType weaponType)
-{
-	SetCurrentWeapon(CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot);
-}
-
-// --MIAMI: Done
-void
-CPed::SetCurrentWeapon(int slot)
-{
-	if (slot == -1)
-		return;
-
-	CWeaponInfo* weaponInfo;
-	if (GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED) {
-		weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-		RemoveWeaponModel(weaponInfo->m_nModelId);
-	}
-	m_currentWeapon = slot;
-
-	if (FindPlayerPed() && IsPlayer())
-		((CPlayerPed*)this)->m_nSelectedWepSlot = m_currentWeapon;
-
-	if (HasWeaponSlot(slot)) {
-		weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-		AddWeaponModel(weaponInfo->m_nModelId);
-	}
-}
-
-// --MIAMI: Done
-// Only used while deciding which gun ped should switch to, if no ammo left.
-bool
-CPed::SelectGunIfArmed(void)
-{
-	for (int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
-		if (GetWeapon(i).m_nAmmoTotal > 0) {
-			eWeaponType weaponType = GetWeapon(i).m_eWeaponType;
-
-			if (weaponType == WEAPONTYPE_COLT45 || weaponType == WEAPONTYPE_PYTHON || weaponType == WEAPONTYPE_SHOTGUN ||
-				weaponType == WEAPONTYPE_SPAS12_SHOTGUN || weaponType == WEAPONTYPE_STUBBY_SHOTGUN ||
-				weaponType == WEAPONTYPE_UZI || weaponType == WEAPONTYPE_M4 || weaponType == WEAPONTYPE_MP5 ||
-				weaponType == WEAPONTYPE_ROCKETLAUNCHER || weaponType == WEAPONTYPE_FLAMETHROWER || weaponType == WEAPONTYPE_SNIPERRIFLE) {
-				SetCurrentWeapon(i);
-				return true;
-			}
-		}
-	}
-	SetCurrentWeapon(WEAPONTYPE_UNARMED);
-	return false;
-}
-
-// --MIAMI: Done
-void
-CPed::Duck(void)
-{
-	if (CTimer::GetTimeInMilliseconds() > m_duckTimer)
-		ClearDuck();
-	else if (bIsDucking && bCrouchWhenShooting) {
-		CWeaponInfo *weapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-		CAnimBlendAssociation *attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCH);
-		if (!attackAssoc) {
-			if(!!weapon->m_bCrouchFire)
-				attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weapon));
-		}
-		if (!attackAssoc) {
-			if(!!weapon->m_bReload)
-				attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchReloadAnim(weapon));
-		}
-		if (!attackAssoc) {
-			bIsDucking = false;
-		}
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::ClearDuck(bool clearTimer)
-{
-	CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_DOWN);
-	if (!animAssoc) {
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_LOW);
-	}
-	if (!animAssoc) {
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCH);
-	}
-
-	if (animAssoc) {
-		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-		animAssoc->blendDelta = -4.0f;
-	}
-	bIsDucking = false;
-
-	if (clearTimer) {
-		m_duckTimer = 0;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::ClearPointGunAt(void)
-{
-	CAnimBlendAssociation *animAssoc;
-	CWeaponInfo *weaponInfo;
-
-	ClearLookFlag();
-	ClearAimFlag();
-	bIsPointingGunAt = false;
-	if (m_nPedState == PED_AIM_GUN || m_nPedState == PED_ATTACK) {
-		SetPedState(PED_IDLE);
-		RestorePreviousState();
-	}
-	weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE);
-	if (!animAssoc || animAssoc->blendDelta < 0.0f) {
-		if (!!weaponInfo->m_bCrouchFire) {
-			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weaponInfo));
-		}
-	}
-	if (animAssoc) {
-		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-		animAssoc->blendDelta = -4.0f;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::BeingDraggedFromCar(void)
-{
-	AnimationId enterAnim;
-	bool dontRunAnim = false;
-
-	if (!m_pVehicleAnim) {
-		CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 1000.0f);
-
-		AssocGroupId assocGroup;
-		if (m_pMyVehicle && m_pMyVehicle->IsBike()) {
-			enterAnim = ANIM_BIKE_HIT;
-			assocGroup = ((CBike*)m_pMyVehicle)->m_bikeAnimType;
-
-		} else {
-			if (m_vehEnterType == CAR_DOOR_LF || m_vehEnterType == CAR_DOOR_LR) {
-				if (bWillBeQuickJacked && m_vehEnterType == CAR_DOOR_LF) {
-					enterAnim = ANIM_CAR_QJACKED;
-				} else if (m_pMyVehicle->bLowVehicle) {
-					enterAnim = ANIM_CAR_LJACKED_LHS;
-				} else {
-					enterAnim = ANIM_CAR_JACKED_LHS;
-				}
-			} else if (m_vehEnterType == CAR_DOOR_RF || m_vehEnterType == CAR_DOOR_RR) {
-				if (m_pMyVehicle->bLowVehicle)
-					enterAnim = ANIM_CAR_LJACKED_RHS;
-				else
-					enterAnim = ANIM_CAR_JACKED_RHS;
-			} else
-				dontRunAnim = true;
-
-			assocGroup = ASSOCGRP_STD;
-		}
-
-		if (!dontRunAnim)
-			m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), assocGroup, enterAnim);
-
-		m_pVehicleAnim->SetFinishCallback(PedSetDraggedOutCarCB, this);
-
-		if (m_pMyVehicle && m_pMyVehicle->IsBike()) {
-			LineUpPedWithCar(LINE_UP_TO_CAR_FALL);
-		} else {
-			LineUpPedWithCar(LINE_UP_TO_CAR_START);
-		}
-		return;
-
-	} else if (m_pVehicleAnim->animId == ANIM_BIKE_HIT) {
-		LineUpPedWithCar(LINE_UP_TO_CAR_FALL);
-
-	} else if (m_pVehicleAnim->currentTime <= 1.4f) {
-		m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-		LineUpPedWithCar(LINE_UP_TO_CAR_START);
-
-	} else {
-		LineUpPedWithCar(LINE_UP_TO_CAR_2);
-	}
-
-	static float mult = 5.f;
-	if (m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE) {
-		if (m_pMyVehicle) {
-			m_pMyVehicle->ProcessOpenDoor(m_vehEnterType, NUM_STD_ANIMS, m_pVehicleAnim->currentTime * mult);
-		}
+		if (m_nPedState == PED_EXIT_CAR || m_nPedState == PED_DRAG_FROM_CAR)
+			m_pMyVehicle->m_nGettingOutFlags &= ~door_flag;
+		bInVehicle = false;
+		m_pMyVehicle = nil;
+	} else if (EnteringCar()) {
+		QuitEnteringCar();
 	}
-}
-
-// --MIAMI: Done
-void
-CPed::RestartNonPartialAnims(void)
-{
-	CAnimBlendAssociation *assoc;
+	if (m_pFire)
+		m_pFire->Extinguish();
 
-	for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
-		if (!assoc->IsPartial())
-			assoc->SetRun();
-	}
+	ClearWeapons();
+	if (bCarPassenger)
+		CPopulation::ms_nTotalCarPassengerPeds--;
+	if (bMiamiViceCop)
+		CPopulation::NumMiamiViceCops--;
+	CPopulation::UpdatePedCount((ePedType)m_nPedType, true);
+	DMAudio.DestroyEntity(m_audioEntityId);
 }
 
 // --MIAMI: Done
 void
-CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg)
-{
-	CAnimBlendAssociation *quickJackedAssoc;
-	CVehicle *vehicle; 
-	CPed *ped = (CPed*)arg;
-
-	uint8 exitFlags = 0;
-	quickJackedAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), ANIM_CAR_QJACKED);
-	if (dragAssoc && dragAssoc->animId == ANIM_BIKE_HIT && ped->m_pMyVehicle) {
-		if (ped->m_vehEnterType == CAR_DOOR_LF || ped->m_vehEnterType == CAR_DOOR_RF) {
-			CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_BIKE_FALL_OFF, 100.0f);
-			ped->m_pMyVehicle->m_nGettingOutFlags &= ~(CAR_DOOR_FLAG_RF | CAR_DOOR_FLAG_LF);
-		} else {
-			CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_BIKE_FALL_R, 100.0f);
-			ped->m_pMyVehicle->m_nGettingOutFlags &= ~(CAR_DOOR_FLAG_RR | CAR_DOOR_FLAG_LR);
-		}
-		((CBike*)ped->m_pMyVehicle)->KnockOffRider(WEAPONTYPE_UNIDENTIFIED, 0, ped, true);
-		return;
-	}
-
-	if (ped->m_nPedState != PED_ARRESTED) {
-		ped->m_nLastPedState = PED_NONE;
-		if (dragAssoc)
-			dragAssoc->blendDelta = -1000.0f;
-	}
-	ped->RestartNonPartialAnims();
-	ped->m_pVehicleAnim = nil;
-	ped->m_pSeekTarget = nil;
-	vehicle = ped->m_pMyVehicle;
-
-	if (vehicle && vehicle->IsBike())
-		exitFlags = GetBikeDoorFlagInclJumpInFromFront(ped->m_vehEnterType);
-	else
-		exitFlags = GetCarDoorFlag(ped->m_vehEnterType);
-
-	if (vehicle)
-		vehicle->m_nGettingOutFlags &= ~exitFlags;
-
-	if (vehicle) {
-		if (vehicle->pDriver == ped) {
-			vehicle->RemoveDriver();
-			if (vehicle->m_nDoorLock == CARLOCK_LOCKED_INITIALLY)
-				vehicle->m_nDoorLock = CARLOCK_UNLOCKED;
-
-			if (ped->m_nPedType == PEDTYPE_COP && vehicle->IsLawEnforcementVehicle())
-				vehicle->ChangeLawEnforcerState(false);
-		} else {
-			vehicle->RemovePassenger(ped);
-		}
-	}
-	ped->bInVehicle = false;
-	if (ped->IsPlayer())
-		AudioManager.PlayerJustLeftCar();
-
-	if (ped->m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE) {
-		dragAssoc->SetDeleteCallback(PedSetDraggedOutCarPositionCB, ped);
-		ped->m_fHealth = 0.0f;
-		ped->SetDie(ANIM_FLOOR_HIT, 1000.0f, 0.5f);
-		return;
-	}
-
-	if (quickJackedAssoc) {
-		dragAssoc->SetDeleteCallback(PedSetQuickDraggedOutCarPositionCB, ped);
-	} else {
-		dragAssoc->SetDeleteCallback(PedSetDraggedOutCarPositionCB, ped);
-		if (ped->CanSetPedState())
-			CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
-	}
-
-	ped->ReplaceWeaponWhenExitingVehicle();
-
-	ped->m_nStoredMoveState = PEDMOVE_NONE;
-	ped->bVehExitWillBeInstant = false;
-}
-
-// --MIAMI: Done
-CVector
-CPed::GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float seatPosMult)
-{
-	CVehicleModelInfo *vehModel; 
-	CVector vehDoorPos;
-	CVector vehDoorOffset;
-	float seatOffset;
-
-	vehModel = (CVehicleModelInfo *)CModelInfo::GetModelInfo(veh->GetModelIndex());
-
-	if (veh->IsBike()) {
-		CBike *bike = (CBike*)veh;
-		vehDoorPos = vehModel->GetFrontSeatPosn();
-
-		if (component == CAR_WINDSCREEN) {
-			return bike->GetMatrix() * (vehDoorPos + vecPedBikeKickAnimOffset);
-		} else {
-			switch (bike->m_bikeAnimType) {
-				case ASSOCGRP_BIKE_VESPA:
-					vehDoorOffset = vecPedVespaBikeJumpRhsAnimOffset;
-					break;
-				case ASSOCGRP_BIKE_HARLEY:
-					vehDoorOffset = vecPedHarleyBikeJumpRhsAnimOffset;
-					break;
-				case ASSOCGRP_BIKE_DIRT:
-					vehDoorOffset = vecPedDirtBikeJumpRhsAnimOffset;
-					break;
-				default:
-					vehDoorOffset = vecPedStdBikeJumpRhsAnimOffset;
-					break;
-			}
-			float xOffsetFromAnim = vehDoorOffset.x + seatPosMult * bike->pHandling->fSeatOffsetDistance;
-			if (component == CAR_DOOR_LR || component == CAR_DOOR_RR) {
-				vehDoorPos = vehModel->m_positions[CAR_POS_BACKSEAT];
-			}
-
-			if (component == CAR_DOOR_LR || component == CAR_DOOR_LF)
-				xOffsetFromAnim *= -1.f;
-
-			return bike->GetMatrix() * (vehDoorPos + CVector(xOffsetFromAnim, vehDoorOffset.y, vehDoorOffset.z));
-		}
-	} else {
-		if (veh->bIsVan && (component == CAR_DOOR_LR || component == CAR_DOOR_RR)) {
-			seatOffset = 0.0f;
-			vehDoorOffset = vecPedVanRearDoorAnimOffset;
-		} else {
-			seatOffset = veh->pHandling->fSeatOffsetDistance * seatPosMult;
-			if (veh->bLowVehicle) {
-				vehDoorOffset = vecPedCarDoorLoAnimOffset;
-			} else {
-				vehDoorOffset = vecPedCarDoorAnimOffset;
-			}
-		}
-
-		switch (component) {
-			case CAR_DOOR_RF:
-				vehDoorPos = vehModel->GetFrontSeatPosn();
-				vehDoorPos.x += seatOffset;
-				vehDoorOffset.x = -vehDoorOffset.x;
-				break;
-
-			case CAR_DOOR_RR:
-				vehDoorPos = vehModel->m_positions[CAR_POS_BACKSEAT];
-				vehDoorPos.x += seatOffset;
-				vehDoorOffset.x = -vehDoorOffset.x;
-				break;
-
-			case CAR_DOOR_LF:
-				vehDoorPos = vehModel->GetFrontSeatPosn();
-				vehDoorPos.x = -(vehDoorPos.x + seatOffset);
-				break;
-
-			case CAR_DOOR_LR:
-				vehDoorPos = vehModel->m_positions[CAR_POS_BACKSEAT];
-				vehDoorPos.x = -(vehDoorPos.x + seatOffset);
-				break;
-
-			default:
-				vehDoorPos = vehModel->GetFrontSeatPosn();
-				vehDoorOffset = CVector(0.0f, 0.0f, 0.0f);
-		}
-		return vehDoorPos - vehDoorOffset;
-	}
-}
-
-// --MIAMI: Done
-CVector
-CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component)
+CPed::Initialise(void)
 {
-	CVector vehDoorPos = GetPositionToOpenCarDoor(veh, component, 1.0f);
-
-/*
-	// Unused
-	vehDoorPosWithoutOffset = veh->GetMatrix() * localVehDoorPos;
-*/
-	return vehDoorPos;
-}
-
-// --MIAMI: Done
-CVector
-CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset)
-{	
-	CVector doorPos;
-	CMatrix vehMat(veh->GetMatrix());
-
-	if (veh->IsBike()) {
-		CVehicleModelInfo* vehModel = (CVehicleModelInfo*)CModelInfo::GetModelInfo(veh->GetModelIndex());
-		CVector vehDoorOffset;
-		CBike* bike = (CBike*)veh;
-		doorPos = vehModel->GetFrontSeatPosn();
-
-		if (component == CAR_WINDSCREEN) {
-			return bike->GetMatrix() * (doorPos + vecPedBikeKickAnimOffset);
-		} else {
-			switch (bike->m_bikeAnimType) {
-			case ASSOCGRP_BIKE_VESPA:
-				vehDoorOffset = vecPedVespaBikeJumpRhsAnimOffset;
-				break;
-			case ASSOCGRP_BIKE_HARLEY:
-				vehDoorOffset = vecPedHarleyBikeJumpRhsAnimOffset;
-				break;
-			case ASSOCGRP_BIKE_DIRT:
-				vehDoorOffset = vecPedDirtBikeJumpRhsAnimOffset;
-				break;
-			default:
-				vehDoorOffset = vecPedStdBikeJumpRhsAnimOffset;
-				break;
-			}
-			vehDoorOffset.x += offset * bike->pHandling->fSeatOffsetDistance;
-			if (component == CAR_DOOR_LR || component == CAR_DOOR_RR) {
-				doorPos = vehModel->m_positions[CAR_POS_BACKSEAT];
-			}
-
-			if (component == CAR_DOOR_LR || component == CAR_DOOR_LF)
-				vehDoorOffset.x *= -1.f;
-
-			CVector correctedPos;
-			bike->GetCorrectedWorldDoorPosition(correctedPos, vehDoorOffset, doorPos);
-			return correctedPos;
-		}
-	}
-	doorPos = Multiply3x3(vehMat, GetLocalPositionToOpenCarDoor(veh, component, offset));
-
-	return veh->GetPosition() + doorPos;
+	debug("Initialising CPed...\n");
+	CPedType::Initialise();
+	LoadFightData();
+	SetAnimOffsetForEnterOrExitVehicle();
+	debug("CPed ready\n");
 }
 
 // --MIAMI: Done
 void
-CPed::LineUpPedWithCar(PedLineUpPhase phase)
+CPed::SetModelIndex(uint32 mi)
 {
-	bool vehIsUpsideDown = false;
-	int vehAnim;
-	float seatPosMult = 0.0f;
-	float currentZ;
-	float adjustedTimeStep;
-	CVector autoZPos;
-
-	if (CReplay::IsPlayingBack())
-		return;
-
-	if (!bChangedSeat && phase != LINE_UP_TO_CAR_2) {
-		if (m_pMyVehicle->IsBike()) {
-			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_RIDE) ||
-				RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_PASSENGER)) {
-				SetPedPositionInCar();
-				return;
-			}
-		} else {
-			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SIT)) {
-				SetPedPositionInCar();
-				return;
-			}
-			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LSIT)) {
-				SetPedPositionInCar();
-				return;
-			}
-			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SITP)) {
-				SetPedPositionInCar();
-				return;
-			}
-			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SITPLO)) {
-				SetPedPositionInCar();
-				return;
-			}
-		}
-		bChangedSeat = true;
-	}
-	if (phase == LINE_UP_TO_CAR_FALL) {
-		SetPedPositionInCar();
-		autoZPos = GetPosition();
-		CPedPlacement::FindZCoorForPed(&autoZPos);
-		if (m_pVehicleAnim && (m_pVehicleAnim->animId == ANIM_CAR_ROLLOUT_LHS || m_pVehicleAnim->animId == ANIM_CAR_ROLLOUT_RHS)
-			&& autoZPos.z > GetPosition().z) {
-			m_matrix.GetPosition().z = autoZPos.z;
-		}
-		if (m_pVehicleAnim && m_pVehicleAnim->animId == ANIM_BIKE_HIT) {
-			if (autoZPos.z > GetPosition().z)
-				m_matrix.GetPosition().z += m_pVehicleAnim->GetProgress() * (autoZPos.z - GetPosition().z);
-
-		} else if (m_pVehicleAnim) {
-			if (m_pVehicleAnim->animId == ANIM_BIKE_GETOFF_BACK) {
-				if (autoZPos.z > GetPosition().z) {
-					m_matrix.GetPosition().z += (m_pVehicleAnim->currentTime * (20.f / 7.f)) * (autoZPos.z - GetPosition().z);
-				}
-			}
-		}
-		return;
-	}
-	if (phase == LINE_UP_TO_CAR_START) {
-		m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-	}
-	CVehicle *veh = m_pMyVehicle;
-
-	// Not quite right, IsUpsideDown func. checks for <= -0.9f.
-	if (veh->GetUp().z <= -0.8f)
-		vehIsUpsideDown = true;
-
-	if (m_vehEnterType == CAR_DOOR_RF || m_vehEnterType == CAR_DOOR_RR) {
-		if (vehIsUpsideDown) {
-			m_fRotationDest = -PI + veh->GetForward().Heading();
-		} else if (veh->bIsBus) {
-			m_fRotationDest = 0.5f * PI + veh->GetForward().Heading();
-		} else {
-			m_fRotationDest = veh->GetForward().Heading();
-		}
-	} else if (m_vehEnterType == CAR_DOOR_LF || m_vehEnterType == CAR_DOOR_LR) {
-		if (vehIsUpsideDown) {
-			m_fRotationDest = veh->GetForward().Heading();
-		} else if (veh->bIsBus) {
-			m_fRotationDest = -0.5f * PI + veh->GetForward().Heading();
-		} else {
-			m_fRotationDest = veh->GetForward().Heading();
-		}
-	} else {
-		// I don't know will this part ever run(maybe boats?), but the game also handles that. I don't know is it intentional.
-
-		if (vehIsUpsideDown) {
-			m_fRotationDest = veh->GetForward().Heading();
-		} else if (veh->bIsBus) {
-			m_fRotationDest = 0.5f * PI + veh->GetForward().Heading();
-		} else if (m_vehEnterType == CAR_WINDSCREEN) {
-			m_fRotationDest = veh->GetForward().Heading() + PI;
-		} else {
-			m_fRotationDest = veh->GetForward().Heading();
-		}
-	}
-
-	bool multExtractedFromAnim = false;
-	bool multExtractedFromAnimBus = false;
-	float zBlend;
-	if (m_pVehicleAnim) {
-		vehAnim = m_pVehicleAnim->animId;
-
-		switch (vehAnim) {
-			case ANIM_CAR_JACKED_RHS:
-			case ANIM_CAR_LJACKED_RHS:
-			case ANIM_CAR_JACKED_LHS:
-			case ANIM_CAR_LJACKED_LHS:
-			case ANIM_VAN_GETIN_L:
-			case ANIM_VAN_GETIN:
-				multExtractedFromAnim = true;
-				zBlend = Max(m_pVehicleAnim->GetProgress() - 0.3f, 0.0f) / (1.0f - 0.3f);
-				// fall through
-
-			case ANIM_CAR_QJACKED:
-			case ANIM_CAR_GETOUT_LHS:
-			case ANIM_CAR_GETOUT_LOW_LHS:
-			case ANIM_CAR_GETOUT_RHS:
-			case ANIM_CAR_GETOUT_LOW_RHS:
-
-				if (!multExtractedFromAnim) {
-					multExtractedFromAnim = true;
-					zBlend = Max(m_pVehicleAnim->GetProgress() - 0.5f, 0.0f) / (1.0f - 0.5f);
-				}
-				// fall through
-
-			case ANIM_CAR_CRAWLOUT_RHS:
-			case ANIM_CAR_CRAWLOUT_RHS2:
-			case ANIM_VAN_GETOUT_L:
-			case ANIM_VAN_GETOUT:
-			case ANIM_BIKE_GETOFF_RHS:
-			case ANIM_BIKE_GETOFF_LHS:
-				seatPosMult = m_pVehicleAnim->GetProgress();
-				break;
-			case ANIM_CAR_GETIN_RHS:
-			case ANIM_CAR_GETIN_LHS:
-				if (veh && veh->IsCar() && veh->bIsBus) {
-					multExtractedFromAnimBus = true;
-					zBlend = Min(m_pVehicleAnim->GetProgress(), 0.5f) / 0.5f;
-				}
-				// fall through
-
-			case ANIM_CAR_QJACK:
-			case ANIM_CAR_GETIN_LOW_LHS:
-			case ANIM_CAR_GETIN_LOW_RHS:
-			case ANIM_DRIVE_BOAT:
-				seatPosMult = m_pVehicleAnim->GetTimeLeft() / m_pVehicleAnim->hierarchy->totalLength;
-				break;
-			case ANIM_CAR_CLOSEDOOR_LHS:
-			case ANIM_CAR_CLOSEDOOR_LOW_LHS:
-			case ANIM_CAR_CLOSEDOOR_RHS:
-			case ANIM_CAR_CLOSEDOOR_LOW_RHS:
-			case ANIM_CAR_SHUFFLE_RHS:
-			case ANIM_CAR_LSHUFFLE_RHS:
-				seatPosMult = 0.0f;
-				break;
-			case ANIM_CAR_JUMPIN_LHS:
-			{
-				float animLength = m_pVehicleAnim->hierarchy->totalLength;
-				seatPosMult = Max(0.0f, 0.5f * animLength - m_pVehicleAnim->currentTime) / animLength;
-				break;
-			}
-			case ANIM_CAR_CLOSE_LHS:
-			case ANIM_CAR_CLOSE_RHS:
-			case ANIM_COACH_OPEN_L:
-			case ANIM_COACH_OPEN_R:
-			case ANIM_COACH_IN_L:
-			case ANIM_COACH_IN_R:
-			case ANIM_COACH_OUT_L:
-				seatPosMult = 1.0f;
-				break;
-			default:
-				if (veh->IsBike()) {
-					seatPosMult = 0.0f;
-				} else {
-					if (bInVehicle)
-						seatPosMult = 0.0f;
-					else
-						seatPosMult = 1.0f;
-				}
-				break;
-		}
-	} else {
-		if (veh->IsBike()) {
-			seatPosMult = 0.0f;
-		} else {
-			if (bInVehicle)
-				seatPosMult = 0.0f;
-			else
-				seatPosMult = 1.0f;
-		}
-	}
-
-	CVector neededPos;
-
-	if (phase == LINE_UP_TO_CAR_2) {
-		neededPos = GetPosition();
-	} else {
-		neededPos = GetPositionToOpenCarDoor(veh, m_vehEnterType, seatPosMult);
-	}
-
-	autoZPos = neededPos;
-
-	if (veh->bIsInWater) {
-		if (veh->m_vehType == VEHICLE_TYPE_BOAT && veh->IsUpsideDown())
-			autoZPos.z += 1.0f;
-	} else {
-		CPedPlacement::FindZCoorForPed(&autoZPos);
-	}
-
-	if (phase == LINE_UP_TO_CAR_END || phase == LINE_UP_TO_CAR_2) {
-		neededPos.z = GetPosition().z;
-
-		// Getting out
-		if (!veh->bIsBus || (veh->bIsBus && vehIsUpsideDown)) {
-			float nextZSpeed = m_vecMoveSpeed.z - GRAVITY * CTimer::GetTimeStep();
-
-			// If we're not in ground at next step, apply animation
-			if (neededPos.z + nextZSpeed >= autoZPos.z) {
-				m_vecMoveSpeed.z = nextZSpeed;
-				ApplyMoveSpeed();
-				// Removing below line breaks the animation
-				neededPos.z = GetPosition().z;
-			} else {
-				neededPos.z = autoZPos.z;
-				m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-			}
-		}
-	}
-
-	if (autoZPos.z > neededPos.z) {
-		vehAnim = m_pVehicleAnim->animId;
-		if (veh->IsBike() && (m_pVehicleAnim && vehAnim != ANIM_BIKE_KICK)) {
-			float zBlend;
-			if (vehAnim != ANIM_BIKE_GETOFF_RHS && vehAnim != ANIM_BIKE_GETOFF_LHS) {
-				if (vehAnim != ANIM_BIKE_JUMPON_R && vehAnim != ANIM_BIKE_JUMPON_L) {
-					zBlend = 0.0f;
-				} else {
-					float animLength = m_pVehicleAnim->hierarchy->totalLength;
-					zBlend = Min(1.0f, 2.0f * m_pVehicleAnim->currentTime / animLength);
-				}
-			} else {
-				zBlend = 1.0f - seatPosMult;
-			}
-			float curZ = veh->GetPosition().z + FEET_OFFSET;
-			neededPos.z = ((curZ - autoZPos.z) - veh->GetHeightAboveRoad()) * zBlend + autoZPos.z;
-		} else if (multExtractedFromAnim) {
-			neededPos.z += (autoZPos.z - neededPos.z) * zBlend;
-		} else {
-			currentZ = GetPosition().z;
-			if (m_pVehicleAnim && vehAnim != ANIM_VAN_GETIN_L && vehAnim != ANIM_VAN_CLOSE_L && vehAnim != ANIM_VAN_CLOSE && vehAnim != ANIM_VAN_GETIN) {
-				neededPos.z = autoZPos.z;
-				m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-			} else if (neededPos.z <= currentZ && m_pVehicleAnim && vehAnim != ANIM_VAN_CLOSE_L && vehAnim != ANIM_VAN_CLOSE) {
-				adjustedTimeStep = Min(m_pVehicleAnim->timeStep, 0.1f);
-
-				// Smoothly change ped position
-				neededPos.z = currentZ - (currentZ - neededPos.z) / (m_pVehicleAnim->GetTimeLeft() / adjustedTimeStep);
-			}
-		}
-	} else {
-		// We may need to raise up the ped
-		if (phase == LINE_UP_TO_CAR_START) {
-			currentZ = GetPosition().z;
-
-			if (neededPos.z > currentZ) {
-				if (multExtractedFromAnimBus) {
-					neededPos.z = (neededPos.z - currentZ) * zBlend + currentZ;
-				} else {
-					if (m_pVehicleAnim &&
-						(vehAnim == ANIM_CAR_GETIN_RHS || vehAnim == ANIM_CAR_GETIN_LOW_RHS || vehAnim == ANIM_CAR_GETIN_LHS || vehAnim == ANIM_CAR_GETIN_LOW_LHS
-							|| vehAnim == ANIM_CAR_QJACK || vehAnim == ANIM_VAN_GETIN_L || vehAnim == ANIM_VAN_GETIN)) {
-						adjustedTimeStep = Min(m_pVehicleAnim->timeStep, 0.1f);
-
-						// Smoothly change ped position
-						neededPos.z = (neededPos.z - currentZ) / (m_pVehicleAnim->GetTimeLeft() / adjustedTimeStep) + currentZ;
-					} else if (EnteringCar() || m_nPedState == PED_DRIVING && veh->IsBike()) {
-						neededPos.z = Max(currentZ, autoZPos.z);
-					}
-				}
-			}
-		}
-	}
-
-	bool stillGettingInOut = false;
-	if (CTimer::GetTimeInMilliseconds() < m_nPedStateTimer)
-		stillGettingInOut = veh->m_vehType != VEHICLE_TYPE_BOAT || bOnBoat;
-
-	if (!stillGettingInOut) {
-		m_fRotationCur = m_fRotationDest;
-	} else {
-		float limitedDest = CGeneral::LimitRadianAngle(m_fRotationDest);
-		float timeUntilStateChange = (m_nPedStateTimer - CTimer::GetTimeInMilliseconds())/600.0f;
-
-		if (timeUntilStateChange <= 0.0f) {
-			m_vecOffsetSeek.x = 0.0f;
-			m_vecOffsetSeek.y = 0.0f;
-		}
-		m_vecOffsetSeek.z = 0.0f;
-
-		neededPos -= timeUntilStateChange * m_vecOffsetSeek;
-
-		if (PI + m_fRotationCur < limitedDest) {
-			limitedDest -= 2 * PI;
-		} else if (m_fRotationCur - PI > limitedDest) {
-			limitedDest += 2 * PI;
-		}
-		m_fRotationCur -= (m_fRotationCur - limitedDest) * (1.0f - timeUntilStateChange);
-	}
+	CEntity::SetModelIndex(mi);
+	RpAnimBlendClumpInit(GetClump());
+	RpAnimBlendClumpFillFrameArray(GetClump(), m_pFrames);
+	CPedModelInfo *modelInfo = (CPedModelInfo *)CModelInfo::GetModelInfo(GetModelIndex());
+	SetPedStats(modelInfo->m_pedStatType);
+	m_headingRate = m_pedStats->m_headingChangeRate;
+	m_animGroup = (AssocGroupId) modelInfo->m_animGroup;
+	CAnimManager::AddAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE);
 
-	if (seatPosMult > 0.2f || vehIsUpsideDown || veh->IsBike()) {
-		SetPosition(neededPos);
-		SetHeading(m_fRotationCur);
-	} else {
-		CMatrix vehDoorMat(veh->GetMatrix());
-		vehDoorMat.GetPosition() += Multiply3x3(vehDoorMat, GetLocalPositionToOpenCarDoor(veh, m_vehEnterType, 0.0f));
-
-		if (m_vehEnterType == CAR_WINDSCREEN || veh->bIsBus) {
-			CMatrix correctionMat;
-			if (veh->bIsBus && (m_vehEnterType == CAR_DOOR_LF || m_vehEnterType == CAR_DOOR_LR))
-				correctionMat.SetRotateZ(-HALFPI);
-			else if (veh->bIsBus && (m_vehEnterType == CAR_DOOR_RF || m_vehEnterType == CAR_DOOR_RR))
-				correctionMat.SetRotateZ(HALFPI);
-			else
-				correctionMat.SetRotateZ(PI);
+	if (!CanUseTorsoWhenLooking())
+		m_pedIK.m_flags |= CPedIK::LOOKAROUND_HEAD_ONLY;
 
-			vehDoorMat = vehDoorMat * correctionMat;
-		}
-		GetMatrix() = vehDoorMat;
-	}
+	// This is a mistake by R*, velocity is CVector, whereas m_vecAnimMoveDelta is CVector2D. 
+	(*RPANIMBLENDCLUMPDATA(m_rwObject))->velocity = (CVector*) &m_vecAnimMoveDelta;
 
-}
+	if(modelInfo->GetHitColModel() == nil)
+		modelInfo->CreateHitColModelSkinned(GetClump());
 
-// --MIAMI: Done
-static void
-particleProduceFootDust(CPed *ped, CVector const &pos, float size, int times)
-{
-	switch (ped->m_nSurfaceTouched)
+	UpdateRpHAnim();
+#ifdef USE_CUTSCENE_SHADOW_FOR_PED
+	if (!m_pRTShadow)
 	{
-		case SURFACE_TARMAC:
-		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;
-		default:
-			break;
-	}
-}
-
-// --MIAMI: Done
-static void
-particleProduceFootSplash(CPed *ped, CVector const &pos, float size, int times)
-{
-	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);
-
-		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);
+		m_pRTShadow = new CCutsceneShadow;
+		m_pRTShadow->Create(m_rwObject, 10, 1, 1, 1);
+		//m_pRTShadow->Create(m_rwObject, 8, 0, 0, 0);
 	}
+#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--;
-
-			if (m_bloodyFootprintCountOrDeathTime == 0)
-				bDoBloodyFootprints = false;
-		}
-	}
-
-	if (!bIsStanding)
-		return;
-
-	for (; assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
-		if (assoc->flags & ASSOC_WALK) {
-			walkRunAssoc = assoc;
-			walkRunAssocBlend += assoc->blendAmount;
-		} else if ((assoc->flags & ASSOC_NOWALK) == 0) {
-			idleAssocBlend += assoc->blendAmount;
-		}
-	}
-
-	if (walkRunAssoc && walkRunAssocBlend > 0.5f && idleAssocBlend < 1.0f) {
-
-		float stepStart = 1.f / 15.f;
-		float stepEnd = walkRunAssoc->hierarchy->totalLength / 2.0f + stepStart;
-		float currentTime = walkRunAssoc->currentTime;
-
-		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, 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, gpShadowPedTex, &adjustedFootPos,
-						top.x, top.y,
-						right.x, right.y,
-						120, 250, 250, 50, 4.0f, 5000, 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);
-
-		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);
-
-			CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &adjustedFootPosL,
-				top.x, top.y,
-				right.x, right.y,
-				255, 255, 0, 0, 4.0f, 3000, 1.0f);
-
-			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, gpShadowPedTex, &adjustedFootPosL,
-					top.x, top.y,
-					right.x, right.y,
-					120, 250, 250, 50, 4.0f, 5000, 1.0f);
-			}
-		}
-		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, 1.0f);
-
-			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, gpShadowPedTex, &adjustedFootPosR,
-					top.x, top.y,
-					right.x, right.y,
-					120, 250, 250, 50, 4.0f, 5000, 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) {
-			float particleSize = pedSpeed * 2.0f;
-
-			if (particleSize < 0.25f)
-				particleSize = 0.25f;
-
-			if (particleSize > 0.75f)
-				particleSize = 0.75f;
-
-			CVector particlePos = GetPosition() + GetForward() * 0.3f;
-			particlePos.z -= 1.2f;
-
-			CVector particleDir = m_vecMoveSpeed * -0.75f;
-
-			particleDir.z = CGeneral::GetRandomNumberInRange(0.01f, 0.03f);
-			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);
-		}
-
-		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);
-		}
-	}
-}
-
-// --MIAMI: Done
-bool
-CPed::IsPointerValid(void)
+CPed::SetPedStats(ePedStats pedStat)
 {
-	int pedIndex = CPools::GetPedPool()->GetIndex(this) >> 8;
-	if (pedIndex < 0 || pedIndex >= NUMPEDS)
-		return false;
-
-	if (m_entryInfoList.first || FindPlayerPed() == this)
-		return true;
-
-	return false;
+	m_pedStats = CPedStats::ms_apPedStats[pedStat];
 }
 
 // --MIAMI: Done
-// Some kind of binary sort
 void
-CPed::SortPeds(CPed **list, int min, int max)
+CPed::DeleteRwObject()
 {
-	if (min >= max)
-		return;
-
-	CVector leftDiff, rightDiff;
-	CVector middleDiff = GetPosition() - list[(max + min) / 2]->GetPosition();
-	float middleDist = middleDiff.Magnitude();
-
-	int left = max;
-	int right = min;
-	while(right <= left){
-		float rightDist, leftDist;
-		do {
-			rightDiff = GetPosition() - list[right]->GetPosition();
-			rightDist = rightDiff.Magnitude();
-		} while (middleDist > rightDist && ++right);
-
-		do {
-			leftDiff = GetPosition() - list[left]->GetPosition();
-			leftDist = leftDiff.Magnitude();
-		} while (middleDist < leftDist && left--);
-
-		if (right <= left) {
-			CPed *ped = list[right];
-			list[right] = list[left];
-			list[left] = ped;
-			right++;
-			left--;
-		}
-	}
-	SortPeds(list, min, left);
-	SortPeds(list, right, max);
+	CEntity::DeleteRwObject();
 }
 
 // --MIAMI: Done
@@ -2755,1394 +547,207 @@ CPed::BuildPedLists(void)
 }
 
 // --MIAMI: Done
-void
-CPed::SetPedStats(ePedStats pedStat)
-{
-	m_pedStats = CPedStats::ms_apPedStats[pedStat];
-}
-
-// --MIAMI: Done
-bool
-CPed::CanUseTorsoWhenLooking(void)
-{
-	if (m_nPedState != PED_DRIVING && m_nPedState != PED_DRAG_FROM_CAR && !bIsDucking) {
-		if (m_animGroup != ASSOCGRP_SEXYWOMAN && m_animGroup != ASSOCGRP_WOMAN)
-			return true;
-	}
-	return false;
-}
-
-// --MIAMI: Done
-void
-CPed::SetModelIndex(uint32 mi)
-{
-	CEntity::SetModelIndex(mi);
-	RpAnimBlendClumpInit(GetClump());
-	RpAnimBlendClumpFillFrameArray(GetClump(), m_pFrames);
-	CPedModelInfo *modelInfo = (CPedModelInfo *)CModelInfo::GetModelInfo(GetModelIndex());
-	SetPedStats(modelInfo->m_pedStatType);
-	m_headingRate = m_pedStats->m_headingChangeRate;
-	m_animGroup = (AssocGroupId) modelInfo->m_animGroup;
-	CAnimManager::AddAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE);
-
-	if (!CanUseTorsoWhenLooking())
-		m_pedIK.m_flags |= CPedIK::LOOKAROUND_HEAD_ONLY;
-
-	// This is a mistake by R*, velocity is CVector, whereas m_vecAnimMoveDelta is CVector2D. 
-	(*RPANIMBLENDCLUMPDATA(m_rwObject))->velocity = (CVector*) &m_vecAnimMoveDelta;
-
-	if(modelInfo->GetHitColModel() == nil)
-		modelInfo->CreateHitColModelSkinned(GetClump());
-
-	UpdateRpHAnim();
-#ifdef USE_CUTSCENE_SHADOW_FOR_PED
-	if (!m_pRTShadow)
-	{
-		m_pRTShadow = new CCutsceneShadow;
-		m_pRTShadow->Create(m_rwObject, 10, 1, 1, 1);
-		//m_pRTShadow->Create(m_rwObject, 8, 0, 0, 0);
-	}
-#endif
-}
-
-// --MIAMI: Done
-void
-CPed::RemoveLighting(bool reset)
-{
-	if (!bRenderScorched) {
-		CRenderer::RemoveVehiclePedLights(this, reset);
-		if (reset)
-			ReSetAmbientAndDirectionalColours();
-	}
-	SetAmbientColours();
-	DeActivateDirectional();
-}
-
-// --MIAMI: Done
 bool
-CPed::SetupLighting(void)
-{
-	ActivateDirectional();
-	SetAmbientColoursForPedsCarsAndObjects();
-
-#ifndef MASTER
-	// Originally this was being called through iteration of Sectors, but putting it here is better.
-	if (GetDebugDisplay() != 0 && !IsPlayer())
-		DebugRenderOnePedText();
-#endif
-
-	if (bRenderScorched) {
-		WorldReplaceNormalLightsWithScorched(Scene.world, 0.1f);
-	} else {
-		// Note that this lightMult is only affected by LIGHT_DARKEN. If there's no LIGHT_DARKEN, it will be 1.0.
-		float lightMult = CPointLights::GenerateLightsAffectingObject(&GetPosition());
-		if (lightMult != 1.0f) {
-			SetAmbientAndDirectionalColours(lightMult);
-			return true;
-		}
-	}
-	return false;
-}
-
-// --MIAMI: Done
-void
-CPed::Teleport(CVector pos)
-{
-	CWorld::Remove(this);
-	SetPosition(pos);
-	bIsStanding = false;
-	m_nPedStateTimer = 0;
-	m_actionX = 0.0f;
-	m_actionY = 0.0f;
-	m_pDamageEntity = nil;
-	CWorld::Add(this);
-}
-
-// --MIAMI: Done
-void
-CPed::CalculateNewOrientation(void)
-{
-	if (CReplay::IsPlayingBack() || !IsPedInControl())
-		return;
-
-	SetHeading(m_fRotationCur);
-}
-
-// --MIAMI: Done
-float
-CPed::WorkOutHeadingForMovingFirstPerson(float offset)
-{
-	if (!IsPlayer())
-		return 0.0f;
-
-	CPad *pad0 = CPad::GetPad(0);
-	float leftRight = pad0->GetPedWalkLeftRight();
-	float upDown = pad0->GetPedWalkUpDown();
-	float &angle = ((CPlayerPed*)this)->m_fWalkAngle;
-
-	if (upDown != 0.0f) {
-		angle = CGeneral::GetRadianAngleBetweenPoints(0.0f, 0.0f, -leftRight, upDown);
-	} else {
-		if (leftRight < 0.0f)
-			angle = HALFPI;
-		else if (leftRight > 0.0f)
-			angle = -HALFPI;
-	}
-
-	return CGeneral::LimitRadianAngle(offset + angle);
-}
-
-// --MIAMI: Done
-void
-CPed::CalculateNewVelocity(void)
+CPed::OurPedCanSeeThisOne(CEntity *target, bool shootablesDoBlock)
 {
-	if (IsPedInControl()) {
-		float headAmount = DEGTORAD(m_headingRate) * CTimer::GetTimeStep();
-		m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
-		float limitedRotDest = CGeneral::LimitRadianAngle(m_fRotationDest);
-
-		if (m_fRotationCur - PI > limitedRotDest) {
-				limitedRotDest += 2 * PI;
-		} else if(PI + m_fRotationCur < limitedRotDest) {
-			limitedRotDest -= 2 * PI;
-		}
-
-		float neededTurn = limitedRotDest - m_fRotationCur;
-		if (neededTurn <= headAmount) {
-			if (neededTurn > (-headAmount))
-				m_fRotationCur += neededTurn;
-			else
-				m_fRotationCur -= headAmount;
-		} else {
-			m_fRotationCur += headAmount;
-		}
-	}
-
-	CVector2D forward(Sin(m_fRotationCur), Cos(m_fRotationCur));
-
-	m_moved.x = CrossProduct2D(m_vecAnimMoveDelta, forward); // (m_vecAnimMoveDelta.x * Cos(m_fRotationCur)) + -Sin(m_fRotationCur) * m_vecAnimMoveDelta.y;
-	m_moved.y = DotProduct2D(m_vecAnimMoveDelta, forward);  // m_vecAnimMoveDelta.y* Cos(m_fRotationCur) + (m_vecAnimMoveDelta.x * Sin(m_fRotationCur));
-
-	if (CTimer::GetTimeStep() >= 0.01f) {
-		m_moved = m_moved * (1 / CTimer::GetTimeStep());
-	} else {
-		m_moved = m_moved * (1 / 100.0f);
-	}
-
-	if ((!TheCamera.Cams[TheCamera.ActiveCam].GetWeaponFirstPersonOn() && !TheCamera.Cams[0].Using3rdPersonMouseCam())
-		|| FindPlayerPed() != this || !CanStrafeOrMouseControl()) {
-
-		if (FindPlayerPed() == this)
-			FindPlayerPed()->m_fWalkAngle = 0.0f;
-		return;
-	}
-
-	float walkAngle = WorkOutHeadingForMovingFirstPerson(m_fRotationCur);
-	float pedSpeed = m_moved.Magnitude();
-	float localWalkAngle = CGeneral::LimitRadianAngle(walkAngle - m_fRotationCur);
-
-	if (localWalkAngle < -0.5f * PI) {
-		localWalkAngle += PI;
-	} else if (localWalkAngle > 0.5f * PI) {
-		localWalkAngle -= PI;
-	}
-
-	// Interestingly this part is responsible for diagonal walking.
-	if (localWalkAngle > -DEGTORAD(50.0f) && localWalkAngle < DEGTORAD(50.0f)) {
-		TheCamera.Cams[TheCamera.ActiveCam].m_fPlayerVelocity = pedSpeed;
-		m_moved = CVector2D(-Sin(walkAngle), Cos(walkAngle)) * pedSpeed;
-	}
-
-	CAnimBlendAssociation *idleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE);
-	CAnimBlendAssociation *fightAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FIGHT_IDLE);
-	if(!fightAssoc)
-		fightAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_TIRED);
-
-	if(!fightAssoc)
-		fightAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCHRELOAD);
-
-	if ((!idleAssoc || idleAssoc->blendAmount < 0.5f) && !fightAssoc && !bIsDucking) {
-		LimbOrientation newUpperLegs;
-		newUpperLegs.yaw = localWalkAngle;
-
-		if (newUpperLegs.yaw < -DEGTORAD(100.0f)) {
-			newUpperLegs.yaw += PI;
-		} else if (newUpperLegs.yaw > DEGTORAD(100.0f)) {
-			newUpperLegs.yaw -= PI;
-		}
+	CColPoint colpoint;
+	CEntity *ent;
 
-		if (newUpperLegs.yaw > -DEGTORAD(50.0f) && newUpperLegs.yaw < DEGTORAD(50.0f)) {
-			newUpperLegs.pitch = 0.1f;
-			RwV3d Xaxis = { 1.0f, 0.0f, 0.0f };
-			RwV3d Zaxis = { 0.0f, 0.0f, 1.0f };
-			RtQuatRotate(&m_pFrames[PED_UPPERLEGL]->hanimFrame->q, &Zaxis, RADTODEG(newUpperLegs.pitch), rwCOMBINEPOSTCONCAT);
-			RtQuatRotate(&m_pFrames[PED_UPPERLEGL]->hanimFrame->q, &Xaxis, RADTODEG(newUpperLegs.yaw), rwCOMBINEPOSTCONCAT);
-			RtQuatRotate(&m_pFrames[PED_UPPERLEGR]->hanimFrame->q, &Zaxis, RADTODEG(newUpperLegs.pitch), rwCOMBINEPOSTCONCAT);
-			RtQuatRotate(&m_pFrames[PED_UPPERLEGR]->hanimFrame->q, &Xaxis, RADTODEG(newUpperLegs.yaw), rwCOMBINEPOSTCONCAT);
-			bDontAcceptIKLookAts = true;
-		}
-	}
-}
+	CVector2D dist = CVector2D(target->GetPosition()) - CVector2D(GetPosition());
 
-// --MIAMI: Done, but what is TODO_CHAR??
-bool
-CPed::CanBeDeleted(void)
-{
-	if (bInVehicle)
+	// Check if target is behind ped
+	if (DotProduct2D(dist, CVector2D(GetForward())) < 0.0f)
 		return false;
 
-	switch (CharCreatedBy) {
-		case RANDOM_CHAR:
-			return true;
-		case MISSION_CHAR:
-			return false;
-		case TODO_CHAR:
-			return false;
-		default:
-			return true;
-	}
-}
-
-//--MIAMI: done
-bool
-CPed::CanBeDeletedEvenInVehicle(void)
-{
-	switch (CharCreatedBy) {
-		case RANDOM_CHAR:
-			return true;
-		case MISSION_CHAR:
-			return false;
-		case TODO_CHAR:
-			return false;
-		default:
-			return true;
-	}
-}
-
-// --MIAMI: Done
-bool
-CPed::CanPedDriveOff(void)
-{
-	if (m_nPedState != PED_DRIVING || m_lookTimer > CTimer::GetTimeInMilliseconds())
+	// Check if target is too far away
+	if (dist.Magnitude() >= 40.0f)
 		return false;
 
-	for (int i = 0; i < m_numNearPeds; i++) {
-		CPed *nearPed = m_nearPeds[i];
-		if (nearPed->m_nPedType == m_nPedType && nearPed->m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && nearPed->m_carInObjective == m_carInObjective) {
-			m_lookTimer = CTimer::GetTimeInMilliseconds() + 1000;
-			return false;
-		}
-	}
-	return true;
-}
-
-// --MIAMI: Done
-bool
-CPed::CanPedJumpThis(CEntity *unused, CVector *damageNormal = nil)
-{
-	if (m_nSurfaceTouched == SURFACE_WATER)
-		return true;
-
-	CVector pos = GetPosition();
-	CVector forwardOffset = GetForward();
-	if (damageNormal && damageNormal->z > 0.17f) {
-		if (damageNormal->z > 0.9f)
-			return false;
-
-		CColModel *ourCol = GetColModel();
-		pos.z = ourCol->spheres->center.z - ourCol->spheres->radius * damageNormal->z + pos.z;
-		pos.z = pos.z + 0.05f;
-		float collPower = damageNormal->Magnitude2D();
-		if (damageNormal->z > 0.5f) {
-			CVector invDamageNormal(-damageNormal->x, -damageNormal->y, 0.0f);
-			invDamageNormal *= 1.0f / collPower;
-			CVector estimatedJumpDist = invDamageNormal + collPower * invDamageNormal * ourCol->spheres->radius;
-			forwardOffset = estimatedJumpDist * Min(2.0f / collPower, 4.0f);
-		} else {
-			forwardOffset += collPower * ourCol->spheres->radius * forwardOffset;
-		}
-	} else {
-		pos.z -= 0.15f;
-	}
-
-	CVector forwardPos = pos + forwardOffset;
-	return CWorld::GetIsLineOfSightClear(pos, forwardPos, true, false, false, true, false, false, false);
-}
-
-// --MIAMI: Done
-bool
-CPed::CanPedReturnToState(void)
-{
-	return m_nPedState <= PED_STATES_NO_AI && m_nPedState != PED_AIM_GUN && m_nPedState != PED_ATTACK &&
-		m_nPedState != PED_FIGHT && m_nPedState != PED_STEP_AWAY && m_nPedState != PED_SNIPER_MODE && m_nPedState != PED_LOOK_ENTITY;
-}
-
-// --MIAMI: Done
-bool
-CPed::CanSeeEntity(CEntity *entity, float threshold = CAN_SEE_ENTITY_ANGLE_THRESHOLD)
-{
-	float neededAngle = CGeneral::GetRadianAngleBetweenPoints(
-		entity->GetPosition().x,
-		entity->GetPosition().y,
-		GetPosition().x,
-		GetPosition().y);
-
-	if (neededAngle < 0.0f)
-		neededAngle += TWOPI;
-	else if (neededAngle > TWOPI)
-		neededAngle -= TWOPI;
-
-	float ourAngle = m_fRotationCur;
-	if (ourAngle < 0.0f)
-		ourAngle += TWOPI;
-	else if (ourAngle > TWOPI)
-		ourAngle -= TWOPI;
-
-	float neededTurn = Abs(neededAngle - ourAngle);
-
-	return neededTurn < threshold || TWOPI - threshold < neededTurn;
-}
-
-// --MIAMI: Done
-bool
-CPed::IsTemporaryObjective(eObjective objective)
-{
-	return objective == OBJECTIVE_LEAVE_CAR || objective == OBJECTIVE_SET_LEADER ||
-		objective == OBJECTIVE_LEAVE_CAR_AND_DIE || objective == OBJECTIVE_ENTER_CAR_AS_DRIVER ||
-		objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER;
-}
-
-// --MIAMI: Done
-void
-CPed::SetMoveState(eMoveState state)
-{
-	m_nMoveState = state;
-}
-
-// --MIAMI: Done
-void
-CPed::SetObjectiveTimer(int time)
-{
-	if (time == 0) {
-		m_objectiveTimer = 0;
-	} else if (CTimer::GetTimeInMilliseconds() > m_objectiveTimer) {
-		m_objectiveTimer = CTimer::GetTimeInMilliseconds() + time;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::ForceStoredObjective(eObjective objective)
-{
-	if (objective != OBJECTIVE_ENTER_CAR_AS_DRIVER && objective != OBJECTIVE_ENTER_CAR_AS_PASSENGER) {
-		m_prevObjective = m_objective;
-		return;
-	}
-
-	switch (m_objective) {
-		case OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE:
-		case OBJECTIVE_KILL_CHAR_ON_FOOT:
-		case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
-		case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
-		case OBJECTIVE_GOTO_CHAR_ON_FOOT:
-		case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
-		case OBJECTIVE_HASSLE_CHAR:
-		case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
-		case OBJECTIVE_ENTER_CAR_AS_DRIVER:
-		case OBJECTIVE_GOTO_AREA_ON_FOOT:
-		case OBJECTIVE_RUN_TO_AREA:
-		case OBJECTIVE_GOTO_SEAT_ON_FOOT:
-		case OBJECTIVE_GOTO_ATM_ON_FOOT:
-		case OBJECTIVE_GOTO_BUS_STOP_ON_FOOT:
-		case OBJECTIVE_GOTO_PIZZA_ON_FOOT:
-		case OBJECTIVE_GOTO_SHELTER_ON_FOOT:
-		case OBJECTIVE_SPRINT_TO_AREA:
-		case OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT:
-			return;
-		default:
-			m_prevObjective = m_objective;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetStoredObjective(void)
-{
-	if (m_objective == m_prevObjective)
-		return;
-
-	switch (m_objective) {
-		case OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE:
-		case OBJECTIVE_KILL_CHAR_ON_FOOT:
-		case OBJECTIVE_KILL_CHAR_ANY_MEANS:
-		case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
-		case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
-		case OBJECTIVE_GOTO_CHAR_ON_FOOT:
-		case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
-		case OBJECTIVE_HASSLE_CHAR:
-		case OBJECTIVE_FOLLOW_CHAR_IN_FORMATION:
-		case OBJECTIVE_LEAVE_CAR:
-		case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
-		case OBJECTIVE_ENTER_CAR_AS_DRIVER:
-		case OBJECTIVE_GOTO_AREA_ON_FOOT:
-		case OBJECTIVE_RUN_TO_AREA:
-		case OBJECTIVE_GOTO_SEAT_ON_FOOT:
-		case OBJECTIVE_GOTO_ATM_ON_FOOT:
-		case OBJECTIVE_GOTO_BUS_STOP_ON_FOOT:
-		case OBJECTIVE_GOTO_PIZZA_ON_FOOT:
-		case OBJECTIVE_GOTO_SHELTER_ON_FOOT:
-		case OBJECTIVE_SPRINT_TO_AREA:
-		case OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT:
-			return;
-		default:
-			m_prevObjective = m_objective;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::RestorePreviousObjective(void)
-{
-	if (m_objective == OBJECTIVE_NONE)
-		return;
-
-	if (m_objective != OBJECTIVE_LEAVE_CAR && m_objective != OBJECTIVE_ENTER_CAR_AS_PASSENGER && m_objective != OBJECTIVE_ENTER_CAR_AS_DRIVER
-		&& m_nPedState != PED_CARJACK)
-		m_pedInObjective = nil;
-
-	if (m_objective == OBJECTIVE_WAIT_IN_CAR_THEN_GET_OUT) {
-		m_objective = OBJECTIVE_NONE;
-		if (m_pMyVehicle)
-			SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
-
-	} else {
-		m_objective = m_prevObjective;
-		m_prevObjective = OBJECTIVE_NONE;
-	}
-	bObjectiveCompleted = false;
-}
-
-// --MIAMI: Done
-void
-CPed::SetLeader(CEntity *leader)
-{
-	m_leader = (CPed*)leader;
-
-	if (m_leader) {
-		m_leader->bIsLeader = true;
-		m_leader->RegisterReference((CEntity**)&m_leader);
-	}
+	// Check line of sight from head
+	return !CWorld::ProcessLineOfSight(GetPosition() + CVector(0.f, 0.f, 1.f), target->GetPosition() + CVector(0.f, 0.f, 1.f),
+		colpoint, ent, true, false, false, shootablesDoBlock, false, false, false, shootablesDoBlock);
 }
 
 // --MIAMI: Done
+// Some kind of binary sort
 void
-CPed::SetObjective(eObjective newObj, void *entity)
+CPed::SortPeds(CPed **list, int min, int max)
 {
-	if (DyingOrDead())
-		return;
-
-	if (m_prevObjective == newObj && m_prevObjective != OBJECTIVE_NONE)
-		return;
-
-	if (entity == this)
-		return;
-
-	if (m_attachedTo && newObj != OBJECTIVE_KILL_CHAR_ON_FOOT && newObj != OBJECTIVE_KILL_CHAR_ANY_MEANS && newObj != OBJECTIVE_DESTROY_OBJECT && newObj != OBJECTIVE_DESTROY_CAR)
+	if (min >= max)
 		return;
 
-	if (m_objective == newObj) {
-		switch (newObj) {
-			case OBJECTIVE_KILL_CHAR_ON_FOOT:
-			case OBJECTIVE_KILL_CHAR_ANY_MEANS:
-			case OBJECTIVE_GOTO_CHAR_ON_FOOT:
-			case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
-			case OBJECTIVE_HASSLE_CHAR:
-			case OBJECTIVE_FOLLOW_CHAR_IN_FORMATION:
-			case OBJECTIVE_GOTO_AREA_ANY_MEANS:
-			case OBJECTIVE_GUARD_ATTACK:
-			case OBJECTIVE_KILL_CHAR_ON_BOAT:
-			case OBJECTIVE_SOLICIT_FOOT:
-				if (m_pedInObjective == entity)
-					return;
-				break;
-			case OBJECTIVE_LEAVE_CAR:
-			case OBJECTIVE_FLEE_CAR:
-			case OBJECTIVE_LEAVE_CAR_AND_DIE:
-				return;
-			case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
-			case OBJECTIVE_ENTER_CAR_AS_DRIVER:
-			case OBJECTIVE_DESTROY_CAR:
-			case OBJECTIVE_SOLICIT_VEHICLE:
-			case OBJECTIVE_BUY_ICE_CREAM:
-				if (m_carInObjective == entity)
-					return;
+	CVector leftDiff, rightDiff;
+	CVector middleDiff = GetPosition() - list[(max + min) / 2]->GetPosition();
+	float middleDist = middleDiff.Magnitude();
 
-				if (newObj == OBJECTIVE_BUY_ICE_CREAM && bBoughtIceCream)
-					return;
+	int left = max;
+	int right = min;
+	while(right <= left){
+		float rightDist, leftDist;
+		do {
+			rightDiff = GetPosition() - list[right]->GetPosition();
+			rightDist = rightDiff.Magnitude();
+		} while (middleDist > rightDist && ++right);
 
-				break;
-			case OBJECTIVE_SET_LEADER:
-				if (m_leader == entity)
-					return;
-				break;
-			case OBJECTIVE_AIM_GUN_AT:
-				if (m_pedInObjective == entity)
-					return;
-				break;
-			default:
-				break;
-		}
-	} else {
-		if (newObj != OBJECTIVE_WAIT_IN_CAR_THEN_GET_OUT && (newObj == OBJECTIVE_LEAVE_CAR || newObj == OBJECTIVE_LEAVE_CAR_AND_DIE)
-			&& !bInVehicle)
-			return;
-	}
+		do {
+			leftDiff = GetPosition() - list[left]->GetPosition();
+			leftDist = leftDiff.Magnitude();
+		} while (middleDist < leftDist && left--);
 
-	bObjectiveCompleted = false;
-	ClearPointGunAt();
-	m_objectiveTimer = 0;
-	if (IsTemporaryObjective(m_objective) && !IsTemporaryObjective(newObj)) {
-		m_prevObjective = newObj;
-	} else {
-		if (m_objective != newObj) {
-			if (IsTemporaryObjective(newObj))
-				ForceStoredObjective(newObj);
-			else
-				SetStoredObjective();
+		if (right <= left) {
+			CPed *ped = list[right];
+			list[right] = list[left];
+			list[left] = ped;
+			right++;
+			left--;
 		}
-		m_objective = newObj;
-	}
-
-	switch (newObj) {
-		case OBJECTIVE_WAIT_ON_FOOT_FOR_COP:
-			m_pedInObjective = (CPed*)entity;
-			m_pedInObjective->RegisterReference((CEntity**)&m_pedInObjective);
-			SetIdle();
-			SetLook(m_pedInObjective);
-			break;
-		case OBJECTIVE_WAIT_IN_CAR_THEN_GET_OUT:
-
-			// In this special case, entity parameter isn't CEntity, but int.
-			SetObjectiveTimer((uintptr)entity);
-			break;
-		case OBJECTIVE_KILL_CHAR_ON_FOOT:
-		case OBJECTIVE_KILL_CHAR_ANY_MEANS:
-		case OBJECTIVE_MUG_CHAR:
-		case OBJECTIVE_KILL_CHAR_ON_BOAT:
-			m_pNextPathNode = nil;
-			bUsePedNodeSeek = false;
-
-			if (m_pedInObjective)
-				m_pedInObjective->CleanUpOldReference((CEntity**)&m_pedInObjective);
-			if (m_pLookTarget)
-				m_pLookTarget->CleanUpOldReference(&m_pLookTarget);
-			
-			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; // duplicate
-			m_pLookTarget->RegisterReference((CEntity**)&m_pLookTarget);
-			break;
-		case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
-		case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
-		case OBJECTIVE_GOTO_CHAR_ON_FOOT:
-		case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
-		case OBJECTIVE_HASSLE_CHAR:
-		case OBJECTIVE_GUARD_ATTACK:
-
-			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:
-			m_pedInObjective = (CPed*)entity;
-			m_pedInObjective->RegisterReference((CEntity**)&m_pedInObjective);
-			m_pedFormation = FORMATION_REAR;
-			break;
-		case OBJECTIVE_LEAVE_CAR:
-		case OBJECTIVE_LEAVE_CAR_AND_DIE:
-		case OBJECTIVE_FLEE_CAR:
-			m_carInObjective = (CVehicle*)entity;
-			m_carInObjective->RegisterReference((CEntity **)&m_carInObjective);
-			if (m_carInObjective->bIsBus && m_leaveCarTimer == 0) {
-				for (int i = 0; i < m_carInObjective->m_nNumMaxPassengers; i++) {
-					if (m_carInObjective->pPassengers[i] == this) {
-						m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 1200 * i;
-						break;
-					}
-				}
-			}
-
-			break;
-		case OBJECTIVE_DESTROY_OBJECT:
-			if (m_pPointGunAt)
-				m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
-			m_pPointGunAt = (CPed*)entity;
-			if (entity)
-				((CEntity*)entity)->RegisterReference((CEntity**) &m_pPointGunAt);
-			break;
-		case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
-		case OBJECTIVE_ENTER_CAR_AS_DRIVER:
-			if (m_nMoveState == PEDMOVE_STILL)
-				SetMoveState(PEDMOVE_RUN);
-
-			if (((CVehicle*)entity)->IsBoat() && !IsPlayer() && m_pCurrentPhysSurface != entity) {
-				RestorePreviousObjective();
-				break;
-			}
-			// fall through
-		case OBJECTIVE_DESTROY_CAR:
-		case OBJECTIVE_SOLICIT_VEHICLE:
-		case OBJECTIVE_BUY_ICE_CREAM:
-			m_carInObjective = (CVehicle*)entity;
-			m_carInObjective->RegisterReference((CEntity**)&m_carInObjective);
-			m_pSeekTarget = m_carInObjective;
-			m_pSeekTarget->RegisterReference((CEntity**)&m_pSeekTarget);
-			m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
-			if (newObj == OBJECTIVE_SOLICIT_VEHICLE) {
-				m_objectiveTimer = CTimer::GetTimeInMilliseconds() + 10000;
-			} else if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && CharCreatedBy == MISSION_CHAR &&
-					(m_carInObjective->GetStatus() == STATUS_PLAYER_DISABLED || CPad::GetPad(CWorld::PlayerInFocus)->ArePlayerControlsDisabled())) {
-				SetObjectiveTimer(14000);
-			} else {
-				m_objectiveTimer = 0;
-			}
-			break;
-		case OBJECTIVE_SET_LEADER:
-			SetLeader((CEntity*)entity);
-			RestorePreviousObjective();
-			break;
-		case OBJECTIVE_AIM_GUN_AT:
-			m_pedInObjective = (CPed*)entity;
-			m_pedInObjective->RegisterReference((CEntity**)&m_pedInObjective);
-			break;
-		case OBJECTIVE_SOLICIT_FOOT:
-			m_pedInObjective = (CPed*)entity;
-			m_pedInObjective->RegisterReference((CEntity**)&m_pedInObjective);
-			break;
-		default:
-			break;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetIdle(void)
-{
-	if (m_nPedState != PED_IDLE && m_nPedState != PED_MUG && m_nPedState != PED_FLEE_ENTITY) {
-		if (m_nPedState == PED_AIM_GUN)
-			ClearPointGunAt();
-
-		SetPedState(PED_IDLE);
-		SetMoveState(PEDMOVE_STILL);
-		m_nLastPedState = PED_NONE;
-	}
-	if (m_nWaitState == WAITSTATE_FALSE) {
-		m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(2000, 4000);
 	}
+	SortPeds(list, min, left);
+	SortPeds(list, right, max);
 }
 
 // --MIAMI: Done
 void
-CPed::SetObjective(eObjective newObj)
+CPed::SetMoveState(eMoveState state)
 {
-	if (DyingOrDead() || m_attachedTo)
-		return;
-
-	if (newObj == OBJECTIVE_NONE) {
-		if ((m_objective == OBJECTIVE_LEAVE_CAR || m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER
-			|| m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE) && !IsPlayer() && !IsPedInControl()) {
-
-			bStartWanderPathOnFoot = true;
-		} else {
-			m_objective = OBJECTIVE_NONE;
-			m_prevObjective = OBJECTIVE_NONE;
-		}
-	} else if (m_prevObjective != newObj || m_prevObjective == OBJECTIVE_NONE) {
-		SetObjectiveTimer(0);
-
-		if (m_objective == newObj)
-			return;
-
-		if (IsTemporaryObjective(m_objective)) {
-			m_prevObjective = newObj;
-		} else {
-			if (m_objective != newObj)
-				SetStoredObjective();
-
-			m_objective = newObj;
-		}
-		bObjectiveCompleted = false;
-
-		switch (newObj) {
-			case OBJECTIVE_NONE:
-				m_prevObjective = OBJECTIVE_NONE;
-				break;
-			case OBJECTIVE_HAIL_TAXI:
-				m_nWaitTimer = 0;
-				SetIdle();
-				SetMoveState(PEDMOVE_STILL);
-				break;
-			default:
-				break;
-		}
-	}
+	m_nMoveState = state;
 }
 
 // --MIAMI: Done
-// Only used in 01E1: SET_CHAR_OBJ_FOLLOW_ROUTE opcode
-// IDA fails very badly in here, puts a fake loop and ignores SetFollowRoute call...
 void
-CPed::SetObjective(eObjective newObj, int16 routePoint, int16 routeType)
+CPed::SetMoveAnim(void)
 {
-	if (DyingOrDead())
-		return;
-
-	if (m_prevObjective == newObj && m_prevObjective != OBJECTIVE_NONE)
+	if (m_nStoredMoveState == m_nMoveState || !IsPedInControl() || m_attachedTo)
 		return;
 
-	if (m_objective == newObj && newObj == OBJECTIVE_FOLLOW_ROUTE && m_routeLastPoint == routePoint && m_routeType == routeType)
+	if (m_nMoveState == PEDMOVE_NONE) {
+		m_nStoredMoveState = PEDMOVE_NONE;
 		return;
-
-	ClearPointGunAt();
-	SetObjectiveTimer(0);
-
-	bObjectiveCompleted = false;
-	if (IsTemporaryObjective(m_objective)) {
-		m_prevObjective = newObj;
-	} else {
-		if (m_objective != newObj)
-			SetStoredObjective();
-
-		m_objective = newObj;
-	}
-
-	if (newObj == OBJECTIVE_FOLLOW_ROUTE) {
-		SetFollowRoute(routePoint, routeType);
 	}
-}
 
-// --MIAMI: Done
-void
-CPed::ClearChat(void)
-{
-	CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_CHAT);
-	if (animAssoc) {
-		animAssoc->blendDelta = -8.0f;
-		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-	}
-	bIsTalking = false;
-	ClearLookFlag();
-	RestorePreviousState();
-	if (m_objective == OBJECTIVE_BUY_ICE_CREAM) {
-		bBoughtIceCream = true;
-		SetObjective(OBJECTIVE_NONE);
-		SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
-	}
-}
-
-// --MIAMI: Done
-bool
-CPed::IsGangMember(void)
-{
-	return m_nPedType >= PEDTYPE_GANG1 && m_nPedType <= PEDTYPE_GANG9;
-}
-
-// --MIAMI: Done
-void
-CPed::InformMyGangOfAttack(CEntity *attacker)
-{
-	CPed *attackerPed;
-
-	if (m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS)
-		return;
+	AssocGroupId animGroupToUse;
+	if (m_leader && m_leader->IsPlayer())
+		animGroupToUse = ASSOCGRP_PLAYER;
+	else
+		animGroupToUse = m_animGroup;
 
-	if (attacker->IsPed()) {
-		attackerPed = (CPed*)attacker;
-	} else {
-		if (!attacker->IsVehicle())
-			return;
+	CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_BLOCK);
+	if (!animAssoc) {
+		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FIGHT_IDLE);
+		if (!animAssoc)
+			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCHRELOAD);
 
-		attackerPed = ((CVehicle*)attacker)->pDriver;
-		if (!attackerPed)
+		if (animAssoc && m_nPedState == PED_FIGHT)
 			return;
-	}
-
-	if (attackerPed->m_nPedType == PEDTYPE_COP)
-		return;
 
-	for (int i = 0; i < m_numNearPeds; i++)	{
-		CPed *nearPed = m_nearPeds[i];
-		if (nearPed && nearPed != this) {
-			CPed *leader = nearPed->m_leader;
-			if (leader && leader == this && nearPed->m_pedStats->m_fear < nearPed->m_pedStats->m_temper) {
-				nearPed->SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, attackerPed);
-				nearPed->SetObjectiveTimer(30000);
+		if (animAssoc) {
+			CAnimBlendAssociation *idleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE);
+			if (!idleAssoc || idleAssoc->blendDelta <= 0.0f) {
+				animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+				animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_IDLE_STANCE, 8.0f);
 			}
 		}
 	}
-}
-
-// --MIAMI: Done
-void
-CPed::QuitEnteringCar(void)
-{
-	CVehicle *veh = m_pMyVehicle;
-	if (m_pVehicleAnim)
-		m_pVehicleAnim->blendDelta = -1000.0f;
-	
-	RestartNonPartialAnims();
-
-	if (!RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE))
-		CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 100.0f);
-	
-	if (veh) {
-		if (m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || m_nPedState == PED_CARJACK)
-			veh->bIsBeingCarJacked = false;
-
-		if (veh->m_nNumGettingIn != 0)
-			veh->m_nNumGettingIn--;
-
-		if (m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER)
-			RestorePreviousObjective();
-
-		if (veh->IsBike()) {
-			veh->m_nGettingInFlags &= ~GetBikeDoorFlag(m_vehEnterType);
-			((CBike*)veh)->bIsBeingPickedUp = false;
-		} else
-			veh->m_nGettingInFlags &= ~GetEnterCarDoorFlag(m_vehEnterType, veh->m_nNumMaxPassengers);
-	}
-
-	bUsesCollision = true;
-
-	if (DyingOrDead()) {
-		if (m_pVehicleAnim) {
-			m_pVehicleAnim->blendDelta = -4.0f;
-			m_pVehicleAnim->flags |= ASSOC_DELETEFADEDOUT;
-			m_pVehicleAnim->flags &= ~ASSOC_RUNNING;
-		}
-	} else
-		SetIdle();
-
-	m_pVehicleAnim = nil;
-	
-	if (veh) {
-		if (veh->AutoPilot.m_nCruiseSpeed == 0 && veh->VehicleCreatedBy == RANDOM_VEHICLE)
-			veh->AutoPilot.m_nCruiseSpeed = 17;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::ReactToAttack(CEntity *attacker)
-{
-	if (IsPlayer() && attacker->IsPed()) {
-		InformMyGangOfAttack(attacker);
-		SetLookFlag(attacker, true);
-		SetLookTimer(700);
-		return;
-	}
-	
-	if (m_nPedType == PEDTYPE_GANG7 && attacker->IsPed() && ((CPed*)attacker)->IsPlayer()) {
-		if (m_nPedState != PED_FALL) {
-			SetFall(15000, (AnimationId)(ANIM_KO_SHOT_FRONT1 + CGeneral::GetRandomNumberInRange(0, 5)), 0);
-		}
-
-	} else if (m_nPedState == PED_DRIVING && InVehicle()
-		&& (m_pMyVehicle->pDriver == this || m_pMyVehicle->pDriver && m_pMyVehicle->pDriver->m_nPedState == PED_DRIVING && m_pMyVehicle->pDriver->m_objective != OBJECTIVE_LEAVE_CAR_AND_DIE)) {
-
-		if (m_pMyVehicle->VehicleCreatedBy == RANDOM_VEHICLE
-			&& (m_pMyVehicle->GetStatus() == STATUS_SIMPLE || m_pMyVehicle->GetStatus() == STATUS_PHYSICS)
-			&& m_pMyVehicle->AutoPilot.m_nCarMission == MISSION_CRUISE) {
-
-			CCarCtrl::SwitchVehicleToRealPhysics(m_pMyVehicle);
-			m_pMyVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
-			m_pMyVehicle->AutoPilot.m_nCruiseSpeed = GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fUnkMaxVelocity;
-			m_pMyVehicle->SetStatus(STATUS_PHYSICS);
-		}
-
-	} else if ((IsPedInControl() || m_nPedState == PED_DRIVING) && (CharCreatedBy != MISSION_CHAR || bRespondsToThreats)) {
-		if (m_leader != attacker && (!m_leader || FindPlayerPed() != m_leader) && attacker->IsPed()) {
-
-			CPed *attackerPed = (CPed*)attacker; 
-			if (bNotAllowedToDuck) {
-				if (!attackerPed->GetWeapon()->IsTypeMelee()) {
-					m_duckAndCoverTimer = CTimer::GetTimeInMilliseconds();
-					return;
-				}
-			} else if (bCrouchWhenShooting || bKindaStayInSamePlace) {
-				SetDuck(CGeneral::GetRandomNumberInRange(1000,3000));
+	if (!animAssoc) {
+		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_TIRED);
+		if (animAssoc)
+			if (m_nWaitState == WAITSTATE_STUCK || m_nWaitState == WAITSTATE_FINISH_FLEE)
 				return;
-			}
-
-			if (m_nWaitState == WAITSTATE_STRIPPER) {
-				ClearWaitState();
-				SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, attacker);
-				SetObjectiveTimer(20000);
 
-			} else {
-				if (m_pedStats->m_fear <= 100 - attackerPed->m_pedStats->m_temper) {
-					if (m_pedStats != attackerPed->m_pedStats) {
-						if (IsGangMember() || m_nPedType == PEDTYPE_EMERGENCY || m_nPedType == PEDTYPE_FIREMAN) {
-							RegisterThreatWithGangPeds(attackerPed);
-						}
-						if (!attackerPed->GetWeapon()->IsTypeMelee() && GetWeapon()->IsTypeMelee()) {
-							SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, attacker);
-							SetMoveState(PEDMOVE_RUN);
-						} else {
-							SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, attacker);
-							SetObjectiveTimer(20000);
-						}
-					}
-				} else {
-					SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, attackerPed);
-					SetMoveState(PEDMOVE_RUN);
-					if (attackerPed->GetWeapon()->IsTypeMelee())
-						Say(SOUND_PED_FLEE_RUN);
-				}
+		if (animAssoc) {
+			CAnimBlendAssociation *idleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE);
+			if (!idleAssoc || idleAssoc->blendDelta <= 0.0f) {
+				animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+				animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_IDLE_STANCE, 4.0f);
 			}
 		}
 	}
-}
-
-
-// --MIAMI: Done
-bool
-CPed::TurnBody(void)
-{
-	bool turnDone = true;
-
-	if (m_pLookTarget)
-		m_fLookDirection = CGeneral::GetRadianAngleBetweenPoints(
-					m_pLookTarget->GetPosition().x,
-					m_pLookTarget->GetPosition().y,
-					GetPosition().x,
-					GetPosition().y);
-
-	float limitedLookDir = CGeneral::LimitRadianAngle(m_fLookDirection);
-	float currentRot = m_fRotationCur;
-
-	if (currentRot - PI > limitedLookDir)
-		limitedLookDir += 2 * PI;
-	else if (PI + currentRot < limitedLookDir)
-		limitedLookDir -= 2 * PI;
-
-	float neededTurn = currentRot - limitedLookDir;
-	m_fRotationDest = limitedLookDir;
-
-	if (Abs(neededTurn) > 0.05f) {
-		turnDone = false;
-		currentRot -= neededTurn * 0.2f;
-	}
-
-	m_fRotationCur = currentRot;
-	m_fLookDirection = limitedLookDir;
-	return turnDone;
-}
-
-// --MIAMI: Done
-void
-CPed::Chat(void)
-{
-	// We're already looking to our partner
-	if (bIsLooking && TurnBody())
-		ClearLookFlag();
-
-	if (!m_pLookTarget || !m_pLookTarget->IsPed()) {
-		ClearChat();
-		return;
-	}
-
-	CPed *partner = (CPed*) m_pLookTarget;
+	if (!animAssoc) {
+		m_nStoredMoveState = m_nMoveState;
+		if (m_nMoveState == PEDMOVE_WALK || m_nMoveState == PEDMOVE_RUN || m_nMoveState == PEDMOVE_SPRINT) {
+			for (CAnimBlendAssociation *assoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
+				assoc; assoc = RpAnimBlendGetNextAssociation(assoc, ASSOC_PARTIAL)) {
 
-	if (partner->m_nPedState != PED_CHAT) {
-		ClearChat();
-		m_standardTimer = CTimer::GetTimeInMilliseconds() + 30000;
-		if (partner->m_pedInObjective) {
-			if (partner->m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT ||
-				partner->m_objective == OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE)
-				ReactToAttack(partner->m_pedInObjective);
-		}
-		return;
-	}
-	if (bIsTalking) {
-		if (CGeneral::GetRandomNumber() < 512) {
-			CAnimBlendAssociation *chatAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_CHAT);
-			if (chatAssoc) {
-				chatAssoc->blendDelta = -4.0f;
-				chatAssoc->flags |= ASSOC_DELETEFADEDOUT;
+				if (!(assoc->flags & ASSOC_FADEOUTWHENDONE)) {
+					assoc->blendDelta = -2.0f;
+					assoc->flags |= ASSOC_DELETEFADEDOUT;
+				}
 			}
-			bIsTalking = false;
-		} else
-			Say(SOUND_PED_CHAT);
-
-	} else {
-
-		if (CGeneral::GetRandomNumber() < 20 && !RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_IDLE)) {
-			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_XPRESS_SCRATCH, 4.0f);
-		}
-		if (!bIsTalking && !RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_IDLE)) {
-			CAnimBlendAssociation *chatAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_CHAT, 4.0f);
-			float chatTime = CGeneral::GetRandomNumberInRange(0.0f, 3.0f);
-			chatAssoc->SetCurrentTime(chatTime);
 
-			bIsTalking = true;
-			Say(SOUND_PED_CHAT);
+			ClearAimFlag();
+			ClearLookFlag();
 		}
-	}
-	if (m_standardTimer && CTimer::GetTimeInMilliseconds() > m_standardTimer) {
-		ClearChat();
-		m_standardTimer = CTimer::GetTimeInMilliseconds() + 30000;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::CheckAroundForPossibleCollisions(void)
-{
-	CVector ourCentre, objCentre;
-	CEntity *objects[8];
-	int16 maxObject;
 
-	if (CTimer::GetTimeInMilliseconds() <= m_nPedStateTimer)
-		return;
-
-	GetBoundCentre(ourCentre);
-
-	CWorld::FindObjectsInRange(ourCentre, 10.0f, true, &maxObject, 6, objects, false, true, false, true, false);
-	for (int i = 0; i < maxObject; i++) {
-		CEntity *object = objects[i];
-		if (bRunningToPhone) {
-			if (gPhoneInfo.PhoneAtThisPosition(object->GetPosition()))
+		switch (m_nMoveState) {
+			case PEDMOVE_STILL:
+				animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_IDLE_STANCE, 4.0f);
 				break;
-		}
-		object->GetBoundCentre(objCentre);
-		float radius = object->GetBoundRadius();
-		if (radius > 4.5f || radius < 1.0f)
-			radius = 1.0f;
-
-		// Developers gave up calculating Z diff. later according to asm.
-		float diff = CVector(ourCentre - objCentre).MagnitudeSqr2D();
-
-		if (sq(radius + 1.0f) > diff)
-			m_fRotationDest += DEGTORAD(22.5f);
-	}
-}
-
-// --MIAMI: Done
-bool
-CPed::MakePhonecall(void)
-{
-	if (CTimer::GetTimeInMilliseconds() <= m_phoneTalkTimer)
-		return false;
-
-	SetIdle();
-	gPhoneInfo.m_aPhones[m_phoneId].m_nState = PHONE_STATE_FREE;
-	m_phoneId = -1;
-	return true;
-}
-
-// --MIAMI: Done
-bool
-CPed::FacePhone(void)
-{
-	// FIX: This function was broken since it's left unused early in development.
-#ifdef FIX_BUGS
-	float phoneDir = CGeneral::GetRadianAngleBetweenPoints(
-		gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.x, gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.y,
-		GetPosition().x, GetPosition().y);
-
-	SetLookFlag(phoneDir, false);
-	bool turnDone = TurnBody();
-	if (turnDone) {
-		SetIdle();
-		ClearLookFlag();
-		m_phoneTalkTimer = CTimer::GetTimeInMilliseconds() + 10000;
-	}
-	return turnDone;
-#else
-	float currentRot = RADTODEG(m_fRotationCur);
-	float phoneDir = CGeneral::GetRadianAngleBetweenPoints(
-		gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.x,
-		gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.y,
-		GetPosition().x,
-		GetPosition().y);
-
-	SetLookFlag(phoneDir, false);
-	phoneDir = CGeneral::LimitAngle(phoneDir);
-	m_moved = CVector2D(0.0f, 0.0f);
-
-	if (currentRot - 180.0f > phoneDir)
-		phoneDir += 2 * 180.0f;
-	else if (180.0f + currentRot < phoneDir)
-		phoneDir -= 2 * 180.0f;
-
-	float neededTurn = currentRot - phoneDir;
-
-	if (Abs(neededTurn) <= 0.75f) {
-		SetIdle();
-		ClearLookFlag();
-		m_phoneTalkTimer = CTimer::GetTimeInMilliseconds() + 10000;
-		return true;
-	} else {
-		m_fRotationCur = DEGTORAD(currentRot - neededTurn * 0.2f);
-		return false;
-	}
-#endif
-}
-
-// --MIAMI: Done
-CPed *
-CPed::CheckForDeadPeds(void)
-{
-	int event;
-	if (CEventList::FindClosestEvent(EVENT_DEAD_PED, GetPosition(), &event)) {
-		int pedHandle = gaEvent[event].entityRef;
-		if (pedHandle && gaEvent[event].entityType == EVENT_ENTITY_PED) {
-			bGonnaInvestigateEvent = true;
-			return CPools::GetPed(pedHandle);
-		}
-	}
-	bGonnaInvestigateEvent = false;
-	return nil;
-}
-
-// --MIAMI: Done
-bool
-CPed::CheckForExplosions(CVector2D &area)
-{
-	int event = 0;
-	if (CEventList::FindClosestEvent(EVENT_EXPLOSION, GetPosition(), &event)) {
-		area.x = gaEvent[event].posn.x;
-		area.y = gaEvent[event].posn.y;
-		CEntity *actualEntity = nil;
-
-		switch (gaEvent[event].entityType) {
-			case EVENT_ENTITY_PED:
-				actualEntity = CPools::GetPed(gaEvent[event].entityRef);
+			case PEDMOVE_WALK:
+				animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_WALK, 1.0f);
 				break;
-			case EVENT_ENTITY_VEHICLE:
-				actualEntity = CPools::GetVehicle(gaEvent[event].entityRef);
+			case PEDMOVE_RUN:
+				if (m_nPedState == PED_FLEE_ENTITY) {
+					animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_RUN, 3.0f);
+				} else {
+					animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_RUN, 1.0f);
+				}
 				break;
-			case EVENT_ENTITY_OBJECT:
-				actualEntity = CPools::GetObject(gaEvent[event].entityRef);
+			case PEDMOVE_SPRINT:
+				animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_SPRINT, 1.0f);
 				break;
 			default:
 				break;
 		}
 
-		if (actualEntity) {
-			m_pEventEntity = actualEntity;
-			m_pEventEntity->RegisterReference((CEntity **) &m_pEventEntity);
-			bGonnaInvestigateEvent = true;
-		} else
-			bGonnaInvestigateEvent = false;
-
-		CEventList::ClearEvent(event);
-		return true;
-	} else if (CEventList::FindClosestEvent(EVENT_FIRE, GetPosition(), &event)) {
-		area.x = gaEvent[event].posn.x;
-		area.y = gaEvent[event].posn.y;
-		CEventList::ClearEvent(event);
-		bGonnaInvestigateEvent = false;
-		return true;
-	}
-
-	bGonnaInvestigateEvent = false;
-	return false;
-}
-
-// --MIAMI: Done
-CPed *
-CPed::CheckForGunShots(void)
-{
-	int event;
-	if (CEventList::FindClosestEvent(EVENT_GUNSHOT, GetPosition(), &event)) {
-		if (gaEvent[event].entityType == EVENT_ENTITY_PED) {
-			// Probably due to we don't want peds to go gunshot area? (same on VC)
-			bGonnaInvestigateEvent = false;
-			return CPools::GetPed(gaEvent[event].entityRef);
-		}
-	}
-	bGonnaInvestigateEvent = false;
-	return nil;
-}
-
-// --MIAMI: Done
-PointBlankNecessity
-CPed::CheckForPointBlankPeds(CPed *pedToVerify)
-{
-	float pbDistance = 1.1f;
-	if (GetWeapon()->IsType2Handed())
-		pbDistance = 1.6f;
-
-	for (int i = 0; i < m_numNearPeds; i++)	{
-		CPed *nearPed = m_nearPeds[i];
-
-		if (!pedToVerify || pedToVerify == nearPed) {
-
-			CVector diff = nearPed->GetPosition() - GetPosition();
-			if (diff.MagnitudeSqr() < SQR(pbDistance)) {
-
-				float neededAngle = CGeneral::GetRadianAngleBetweenPoints(
-					nearPed->GetPosition().x, nearPed->GetPosition().y,
-					GetPosition().x, GetPosition().y);
-				neededAngle = CGeneral::LimitRadianAngle(neededAngle);
-				m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
-
-				float neededTurn = Abs(neededAngle - m_fRotationCur);
-
-				if (neededTurn > PI)
-					neededTurn = 2*PI - neededTurn;
-
-				PedState nearPedState = nearPed->m_nPedState;
+		if (animAssoc) {
+			if (m_leader) {
+				CAnimBlendAssociation *walkAssoc = RpAnimBlendClumpGetAssociation(m_leader->GetClump(), ANIM_WALK);
+				if (!walkAssoc)
+					walkAssoc = RpAnimBlendClumpGetAssociation(m_leader->GetClump(), ANIM_RUN);
 
-				if (nearPedState == PED_FALL || nearPedState == PED_GETUP || nearPedState == PED_DIE || nearPedState == PED_DEAD || nearPedState == PED_DIVE_AWAY)
-					return NO_POINT_BLANK_PED;
+				if (!walkAssoc)
+					walkAssoc = RpAnimBlendClumpGetAssociation(m_leader->GetClump(), ANIM_SPRINT);
 
-				if (neededTurn < CAN_SEE_ENTITY_ANGLE_THRESHOLD) {
-					if (pedToVerify == nearPed)
-						return POINT_BLANK_FOR_WANTED_PED;
+				if (walkAssoc) {
+					animAssoc->speed = walkAssoc->speed;
+				} else {
+					if (CharCreatedBy == MISSION_CHAR)
+						animAssoc->speed = 1.0f;
 					else
-						return POINT_BLANK_FOR_SOMEONE_ELSE;
+						animAssoc->speed = 1.2f - m_randomSeed * 0.4f / MYRAND_MAX;
+							
 				}
+			} else {
+				if (CharCreatedBy == MISSION_CHAR)
+					animAssoc->speed = 1.0f;
+				else
+					animAssoc->speed = 1.2f - m_randomSeed * 0.4f / MYRAND_MAX;
 			}
 		}
 	}
-	return NO_POINT_BLANK_PED;
-}
-
-// --MIAMI: Done
-bool
-CPed::CheckIfInTheAir(void)
-{
-	if (bInVehicle)
-		return false;
-
-	CVector pos = GetPosition();
-	CColPoint foundColPoint;
-	CEntity *foundEntity;
-
-	float startZ = pos.z - 1.54f;
-	bool foundGround = CWorld::ProcessVerticalLine(pos, startZ, foundColPoint, foundEntity, true, true, false, true, false, false, nil);
-	if (!foundGround && m_nPedState != PED_JUMP)
-	{
-		pos.z -= FEET_OFFSET;
-		if (CWorld::TestSphereAgainstWorld(pos, 0.15f, this, true, false, false, false, false, false))
-			foundGround = true;
-	}
-	return !foundGround;
-}
-
-// --MIAMI: Done
-void
-CPed::CheckThreatValidity(void)
-{
-	if (m_threatEntity && !IsEntityPointerValid(m_threatEntity)) {
-		m_threatFlags = 0;
-		m_threatEntity = nil;
-	}
-	if (m_pEventEntity && !IsEntityPointerValid(m_pEventEntity)) {
-		m_threatFlags = 0;
-		m_pEventEntity = nil;
-	}
-	if (!m_threatEntity && !m_pEventEntity)
-		m_threatFlags = 0;
 }
 
 // --MIAMI: Done
 void
-CPed::ClearAll(void)
-{
-	if (!IsPedInControl() && m_nPedState != PED_DEAD)
-		return;
-
-	SetPedState(PED_NONE);
-	m_nMoveState = PEDMOVE_NONE;
-	m_pSeekTarget = nil;
-	m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
-	m_fleeFromPos = CVector2D(0.0f, 0.0f);
-	m_fleeFrom = nil;
-	m_fleeTimer = 0;
-	m_threatEx = nil;
-	bUsesCollision = true;
-	ClearPointGunAt();
-	bIsPointingGunAt = false;
-	bRenderPedInCar = true;
-	bKnockedUpIntoAir = false;
-	bKnockedOffBike = false;
-	m_pCollidingEntity = nil;
-}
-
-// --MIAMI: Done
-void
-CPed::ClearAttack(void)
-{
-	if (m_nPedState != PED_ATTACK || (bIsDucking && !IsPlayer()) || m_nWaitState == WAITSTATE_PLAYANIM_DUCK)
-		return;
-
-	if (FindPlayerPed() == this && TheCamera.Using1stPersonWeaponMode()) {
-		SetPointGunAt(nil);
-	} else if (bIsPointingGunAt) {
-		if (m_pLookTarget)
-			SetPointGunAt(m_pLookTarget);
-		else
-			ClearPointGunAt();
-	} else if (m_objective != OBJECTIVE_NONE) {
-		SetIdle();
-	} else {
-		RestorePreviousState();
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::ClearAttackByRemovingAnim(void)
+CPed::StopNonPartialAnims(void)
 {
-	if (m_nPedState != PED_ATTACK)
-		return;
-
-	CWeaponInfo *weapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	CAnimBlendAssociation *weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetPrimaryFireAnim(weapon));
+	CAnimBlendAssociation *assoc;
 
-	if (!weaponAssoc) {
-		if (!!weapon->m_bCrouchFire)
-			weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weapon));
-	}
-	if (!weaponAssoc) {
-		if(!!weapon->m_bFinish3rd)
-			weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetFinishingAttackAnim(weapon));
-	}
-	if (!weaponAssoc) {
-		if(!!weapon->m_bUse2nd)
-			weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetSecondFireAnim(weapon));
-	}
-	if (!weaponAssoc) {
-		if(!!weapon->m_bCop3rd)
-			weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_SPECIAL);
-	}
-	if (weaponAssoc) {
-		weaponAssoc->blendDelta = -8.0f;
-		weaponAssoc->flags &= ~ASSOC_RUNNING;
-		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
-		weaponAssoc->SetDeleteCallback(FinishedAttackCB, this);
-	} else {
-		ClearAttack();
+	for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
+		if (!assoc->IsPartial())
+			assoc->flags &= ~ASSOC_RUNNING;
 	}
 }
 
 // --MIAMI: Done
 void
-CPed::StopNonPartialAnims(void)
+CPed::RestartNonPartialAnims(void)
 {
 	CAnimBlendAssociation *assoc;
 
 	for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
 		if (!assoc->IsPartial())
-			assoc->flags &= ~ASSOC_RUNNING;
+			assoc->SetRun();
 	}
 }
 
@@ -4167,877 +772,6 @@ CPed::SetStoredState(void)
 
 // --MIAMI: Done
 void
-CPed::SetDie(AnimationId animId, float delta, float speed)
-{
-	if (m_attractor)
-		GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-	CPlayerPed *player = FindPlayerPed();
-	if (player == this) {
-		if (!player->m_bCanBeDamaged)
-			return;
-	}
-
-	m_threatEntity = nil;
-	if (DyingOrDead())
-		return;
-
-	CAnimBlendAssociation *dieAssoc = nil;
-	if (m_nPedState == PED_FALL || m_nPedState == PED_GETUP)
-		delta *=  0.5f;
-
-	SetStoredState();
-	ClearAll();
-	m_fHealth = 0.0f;
-	if (m_nPedState == PED_DRIVING) {
-		if (!IsPlayer() && (!m_pMyVehicle || !m_pMyVehicle->IsBike()))
-			FlagToDestroyWhenNextProcessed();
-	} else if (bInVehicle) {
-		if (m_pVehicleAnim)
-			m_pVehicleAnim->blendDelta = -1000.0f;
-	} else if (EnteringCar()) {
-		QuitEnteringCar();
-	}
-
-	SetPedState(PED_DIE);
-	if (animId == NUM_STD_ANIMS) {
-		bIsPedDieAnimPlaying = false;
-	} else {
-		dieAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animId, delta);
-		if (speed > 0.0f)
-			dieAssoc->speed = speed;
-
-		dieAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
-		if (dieAssoc->IsRunning()) {
-			dieAssoc->SetFinishCallback(FinishDieAnimCB, this);
-			bIsPedDieAnimPlaying = true;
-		}
-	}
-
-	Say(SOUND_PED_DEATH);
-	if (m_nLastPedState == PED_ENTER_CAR || m_nLastPedState == PED_CARJACK)
-		QuitEnteringCar();
-
-	if (!bInVehicle)
-		StopNonPartialAnims();
-
-	m_bloodyFootprintCountOrDeathTime = CTimer::GetTimeInMilliseconds();
-	if (!CGame::nastyGame && animId == ANIM_FLOOR_HIT) {
-		if (dieAssoc) {
-			dieAssoc->SetCurrentTime(dieAssoc->hierarchy->totalLength - 0.01f);
-			dieAssoc->SetRun();
-		}
-	}
-}
-
-// --MIAMI: Done
-bool
-CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPieceTypes pedPiece, uint8 direction)
-{
-	CPlayerPed *player = FindPlayerPed();
-	float dieDelta = 4.0f;
-	float dieSpeed = 0.0f;
-	AnimationId dieAnim = ANIM_KO_SHOT_FRONT1;
-	bool headShot = false;
-	bool willLinger = false;
-	int random;
-
-	if (damagedBy == FindPlayerPed() && damagedBy != this && damage > 3.0f)
-		++CWorld::Players[CWorld::PlayerInFocus].m_nHavocLevel;
-
-	if (player == this) {
-		if (!player->m_bCanBeDamaged)
-			return false;
-
-		if (damagedBy && damagedBy->IsPed() && ((CPed*)damagedBy)->m_nPedType == PEDTYPE_GANG7)
-			return false;
-
-		if ((method == WEAPONTYPE_FLAMETHROWER || method == WEAPONTYPE_MOLOTOV) && CWorld::Players[CWorld::PlayerInFocus].m_bFireproof)
-			return false;
-
-		player->AnnoyPlayerPed(false);
-	}
-
-	if (DyingOrDead())
-		return false;
-
-	if (method == WEAPONTYPE_DROWNING && !bDrownsInWater)
-		return false;
-
-	if (!bUsesCollision && (!bInVehicle || m_nPedState != PED_DRIVING) && method != WEAPONTYPE_DROWNING)
-		return false;
-
-	if (bOnlyDamagedByPlayer && damagedBy != player && damagedBy != FindPlayerVehicle() &&
-		method != WEAPONTYPE_DROWNING && method != WEAPONTYPE_EXPLOSION)
-		return false;
-
-	float healthImpact;
-	if (IsPlayer())
-		healthImpact = damage * 0.33f;
-	else
-		healthImpact = damage * m_pedStats->m_defendWeakness;
-
-	if (!IsPlayer() &&
-		(method == WEAPONTYPE_SCREWDRIVER || method == WEAPONTYPE_KNIFE || (method >= WEAPONTYPE_CLEAVER && method <= WEAPONTYPE_CHAINSAW)))
-		m_bleedCounter = 200;
-
-	bool detectDieAnim = true;
-	if (m_nPedState == PED_GETUP) {
-		if (!IsPedHeadAbovePos(-0.3f)) {
-			if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
-				dieAnim = ANIM_FLOOR_HIT_F;
-			else
-				dieAnim = ANIM_FLOOR_HIT;
-			dieDelta *= 2.0f;
-			dieSpeed = 0.5f;
-			detectDieAnim = false;
-		}
-	} else if (m_nPedState == PED_FALL) {
-		CAnimBlendAssociation *fallAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
-		if (!fallAssoc || fallAssoc->IsRunning()) {
-			if (fallAssoc && fallAssoc->blendDelta >= 0.0f)
-				dieAnim = NUM_STD_ANIMS;
-			else
-				dieAnim = ANIM_KO_SHOT_FRONT1;
-		} else {
-			if (fallAssoc->flags & ASSOC_FRONTAL)
-				dieAnim = ANIM_FLOOR_HIT_F;
-			else
-				dieAnim = ANIM_FLOOR_HIT;
-
-			dieDelta *= 2.0f;
-			dieSpeed = 0.5f;
-		}
-		detectDieAnim = false;
-	}
-
-	if (detectDieAnim) {
-		switch (method) {
-			case WEAPONTYPE_UNARMED:
-			case WEAPONTYPE_BRASSKNUCKLE:
-				if (bMeleeProof)
-					return false;
-
-				if (m_nPedState == PED_FALL) {
-					if (IsPedHeadAbovePos(-0.3f)) {
-						dieAnim = NUM_STD_ANIMS;
-					} else {
-						if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
-							dieAnim = ANIM_FLOOR_HIT_F;
-						else
-							dieAnim = ANIM_FLOOR_HIT;
-						dieDelta = dieDelta * 2.0f;
-						dieSpeed = 0.5f;
-					}
-				} else {
-					switch (direction) {
-						case 0:
-							dieAnim = ANIM_KO_SKID_FRONT;
-							break;
-						case 1:
-							dieAnim = ANIM_KO_SPIN_R;
-							break;
-						case 2:
-							dieAnim = ANIM_KO_SKID_BACK;
-							break;
-						case 3:
-							dieAnim = ANIM_KO_SPIN_L;
-							break;
-						default:
-							break;
-					}
-				}
-				break;
-			case WEAPONTYPE_SCREWDRIVER:
-			case WEAPONTYPE_GOLFCLUB:
-			case WEAPONTYPE_NIGHTSTICK:
-			case WEAPONTYPE_KNIFE:
-			case WEAPONTYPE_BASEBALLBAT:
-			case WEAPONTYPE_HAMMER:
-			case WEAPONTYPE_CLEAVER:
-			case WEAPONTYPE_MACHETE:
-			case WEAPONTYPE_KATANA:
-			case WEAPONTYPE_CHAINSAW:
-				if (bMeleeProof)
-					return false;
-
-				if (method != WEAPONTYPE_KATANA ||
-					damagedBy != FindPlayerPed()
-					|| FindPlayerPed()->m_nPedState != PED_FIGHT
-					|| FindPlayerPed()->m_curFightMove != FIGHTMOVE_MELEE1 && FindPlayerPed()->m_curFightMove != FIGHTMOVE_MELEE2
-					|| CGeneral::GetRandomNumber() & 3) {
-
-					if (m_nPedState == PED_FALL) {
-						if (IsPedHeadAbovePos(-0.3f)) {
-							dieAnim = NUM_STD_ANIMS;
-						} else {
-							if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
-								dieAnim = ANIM_FLOOR_HIT_F;
-							else
-								dieAnim = ANIM_FLOOR_HIT;
-							dieDelta = dieDelta * 2.0f;
-							dieSpeed = 0.5f;
-						}
-					} else if (damagedBy != FindPlayerPed() || FindPlayerPed()->m_curFightMove != FIGHTMOVE_MELEE2) {
-						if (damagedBy != FindPlayerPed() || FindPlayerPed()->m_curFightMove != FIGHTMOVE_MELEE3) {
-							switch (direction) {
-								case 0:
-									dieAnim = ANIM_KO_SKID_FRONT;
-									break;
-								case 1:
-									dieAnim = ANIM_KO_SPIN_R;
-									break;
-								case 2:
-									dieAnim = ANIM_KO_SKID_BACK;
-									break;
-								case 3:
-									dieAnim = ANIM_KO_SPIN_L;
-									break;
-								default:
-									break;
-							}
-						} else {
-							dieAnim = ANIM_KO_SHOT_STOM;
-						}
-					} else {
-						dieAnim = ANIM_KO_SHOT_FACE;
-					}
-				} else {
-					dieAnim = ANIM_KO_SHOT_FACE;
-					RemoveBodyPart(PED_HEAD, direction);
-					headShot = true;
-					willLinger = true;
-				}
-				break;
-			case WEAPONTYPE_COLT45:
-			case WEAPONTYPE_SHOTGUN:
-			case WEAPONTYPE_STUBBY_SHOTGUN:
-			case WEAPONTYPE_SPAS12_SHOTGUN:
-			case WEAPONTYPE_TEC9:
-			case WEAPONTYPE_UZI:
-			case WEAPONTYPE_SILENCED_INGRAM:
-			case WEAPONTYPE_MP5:
-			case WEAPONTYPE_M4:
-			case WEAPONTYPE_RUGER:
-			case WEAPONTYPE_SNIPERRIFLE:
-			case WEAPONTYPE_LASERSCOPE:
-			case WEAPONTYPE_M60:
-			case WEAPONTYPE_MINIGUN:
-			case WEAPONTYPE_UZI_DRIVEBY:
-
-				if (bBulletProof)
-					return false;
-
-				bool dontRemoveLimb;
-				if (IsPlayer() || bNoCriticalHits)
-					dontRemoveLimb = true;
-				else if (method != WEAPONTYPE_M4 && method != WEAPONTYPE_RUGER && method != WEAPONTYPE_SNIPERRIFLE &&
-						method != WEAPONTYPE_LASERSCOPE) {
-					if (method == WEAPONTYPE_SHOTGUN)
-						dontRemoveLimb = CGeneral::GetRandomNumber() & 7;
-					else
-						dontRemoveLimb = CGeneral::GetRandomNumber() & 15;
-				} else
-					dontRemoveLimb = false;
-
-				if (dontRemoveLimb) {
-					if (method == WEAPONTYPE_SHOTGUN) {
-						switch (direction) {
-							case 0:
-								dieAnim = ANIM_KO_SKID_FRONT;
-								break;
-							case 1:
-								dieAnim = ANIM_KO_SPIN_R;
-								break;
-							case 2:
-								dieAnim = ANIM_KO_SKID_BACK;
-								break;
-							case 3:
-								dieAnim = ANIM_KO_SPIN_L;
-								break;
-							default:
-								break;
-						}
-					} else
-						dieAnim = ANIM_KO_SHOT_FRONT1;
-
-					willLinger = false;
-				} else {
-					switch (pedPiece) {
-						case PEDPIECE_TORSO:
-							willLinger = false;
-							dieAnim = ANIM_KO_SHOT_FRONT1;
-							break;
-						case PEDPIECE_MID:
-							willLinger = false;
-							dieAnim = ANIM_KO_SHOT_STOM;
-							break;
-						case PEDPIECE_LEFTARM:
-							dieAnim = ANIM_KO_SHOT_ARML;
-							RemoveBodyPart(PED_UPPERARML, direction);
-							willLinger = true;
-							break;
-						case PEDPIECE_RIGHTARM:
-							dieAnim = ANIM_KO_SHOT_ARMR;
-							RemoveBodyPart(PED_UPPERARMR, direction);
-							willLinger = true;
-							break;
-						case PEDPIECE_LEFTLEG:
-							dieAnim = ANIM_KO_SHOT_LEGL;
-							RemoveBodyPart(PED_UPPERLEGL, direction);
-							willLinger = true;
-							break;
-						case PEDPIECE_RIGHTLEG:
-							dieAnim = ANIM_KO_SHOT_LEGR;
-							RemoveBodyPart(PED_UPPERLEGR, direction);
-							willLinger = true;
-							break;
-						case PEDPIECE_HEAD:
-							dieAnim = ANIM_KO_SHOT_FACE;
-							RemoveBodyPart(PED_HEAD, direction);
-							headShot = true;
-							willLinger = true;
-							break;
-						default:
-							break;
-					}
-				}
-				break;
-			case WEAPONTYPE_GRENADE:
-			case WEAPONTYPE_ROCKETLAUNCHER:
-			case WEAPONTYPE_EXPLOSION:
-				if (bExplosionProof)
-					return false;
-
-				if (CGame::nastyGame && !IsPlayer() && !bInVehicle &&
-					1.0f + healthImpact > m_fArmour + m_fHealth) {
-
-					random = CGeneral::GetRandomNumber();
-					if (random & 1)
-						RemoveBodyPart(PED_UPPERARML, direction);
-					if (random & 2)
-						RemoveBodyPart(PED_UPPERLEGR, direction);
-					if (random & 4)
-						RemoveBodyPart(PED_HEAD, direction);
-					if (random & 8)
-						RemoveBodyPart(PED_UPPERARMR, direction);
-					if (random & 0x10)
-						RemoveBodyPart(PED_UPPERLEGL, direction);
-					if (bBodyPartJustCameOff)
-						willLinger = true;
-				}
-				// fall through
-			case WEAPONTYPE_MOLOTOV:
-				if (bExplosionProof)
-					return false;
-
-				switch (direction) {
-					case 0:
-						dieAnim = ANIM_KO_SKID_FRONT;
-						break;
-					case 1:
-						dieAnim = ANIM_KO_SPIN_R;
-						break;
-					case 2:
-						dieAnim = ANIM_KO_SKID_BACK;
-						break;
-					case 3:
-						dieAnim = ANIM_KO_SPIN_L;
-						break;
-					default:
-						break;
-				}
-				break;
-			case WEAPONTYPE_FLAMETHROWER:
-				if (bFireProof)
-					return false;
-
-				dieAnim = ANIM_KO_SHOT_FRONT1;
-				break;
-			case WEAPONTYPE_RAMMEDBYCAR:
-			case WEAPONTYPE_RUNOVERBYCAR:
-				if (bCollisionProof)
-					return false;
-
-				random = CGeneral::GetRandomNumber() & 3;
-				switch (random) {
-					case 0:
-						if ((pedPiece != PEDPIECE_LEFTARM || random <= 1)
-							&& (pedPiece != PEDPIECE_MID || random != 1)) {
-							if (pedPiece == PEDPIECE_RIGHTARM && random > 1
-								|| pedPiece == PEDPIECE_MID && random == 2)
-						
-								dieAnim = ANIM_KO_SPIN_L;
-							else
-								dieAnim = ANIM_KO_SKID_FRONT;
-						} else
-							dieAnim = ANIM_KO_SPIN_R;
-
-						break;
-					case 1:
-						if (m_nPedState == PED_DIVE_AWAY)
-							dieAnim = ANIM_KD_LEFT;
-						else
-							dieAnim = ANIM_KO_SPIN_R;
-						break;
-					case 2:
-						if ((pedPiece != PEDPIECE_LEFTARM || random <= 1)
-							&& (pedPiece != PEDPIECE_MID || random != 1)) {
-							if ((pedPiece != PEDPIECE_RIGHTARM || random <= 1)
-								&& (pedPiece != PEDPIECE_MID || random != 2)) {
-								dieAnim = ANIM_KO_SKID_BACK;
-							} else {
-								dieAnim = ANIM_KD_RIGHT;
-							}
-						} else
-							dieAnim = ANIM_KD_LEFT;
-						break;
-					case 3:
-						if (m_nPedState == PED_DIVE_AWAY)
-							dieAnim = ANIM_KD_RIGHT;
-						else
-							dieAnim = ANIM_KO_SPIN_L;
-						break;
-					default:
-						break;
-				}
-				if (damagedBy && pedPiece != PEDPIECE_TORSO) {
-					CVehicle *vehicle = (CVehicle*)damagedBy;
-					if (method == WEAPONTYPE_RAMMEDBYCAR) {
-						float vehSpeed = vehicle->m_vecMoveSpeed.Magnitude();
-						dieDelta = 8.0f * vehSpeed + 4.0f;
-					} else {
-						float vehSpeed = vehicle->m_vecMoveSpeed.Magnitude();
-						dieDelta = 12.0f * vehSpeed + 4.0f;
-						dieSpeed = 16.0f * vehSpeed + 1.0f;
-					}
-				}
-				break;
-			case WEAPONTYPE_DROWNING:
-				dieAnim = ANIM_DROWN;
-				break;
-			case WEAPONTYPE_FALL:
-				if (bCollisionProof)
-					return false;
-
-				switch (direction) {
-					case 0:
-						dieAnim = ANIM_KO_SKID_FRONT;
-						break;
-					case 1:
-						dieAnim = ANIM_KO_SPIN_R;
-						break;
-					case 2:
-						dieAnim = ANIM_KO_SKID_BACK;
-						break;
-					case 3:
-						dieAnim = ANIM_KO_SPIN_L;
-						break;
-					default:
-						break;
-				}
-				break;
-			default:
-				break;
-		}
-	}
-
-	if (m_fArmour != 0.0f && method != WEAPONTYPE_DROWNING) {
-		if (player == this)
-			CWorld::Players[CWorld::PlayerInFocus].m_nTimeLastArmourLoss = CTimer::GetTimeInMilliseconds();
-
-		if (healthImpact < m_fArmour) {
-			m_fArmour = m_fArmour - healthImpact;
-			healthImpact = 0.0f;
-		} else {
-			healthImpact = healthImpact - m_fArmour;
-			m_fArmour = 0.0f;
-		}
-	}
-
-	if (healthImpact != 0.0f) {
-		if (player == this)
-			CWorld::Players[CWorld::PlayerInFocus].m_nTimeLastHealthLoss = CTimer::GetTimeInMilliseconds();
-
-		m_lastWepDam = method;
-		m_lastDamEntity = damagedBy;
-	}
-
-	if (method == WEAPONTYPE_FALL) {
-		if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_LHS)) {
-			if (m_fHealth >= 1.0 && m_fHealth - healthImpact < 5.0f) {
-				m_fHealth = Min(m_fHealth, 5.0f);
-				return false;
-			}
-		}
-	}
-
-	if (m_fHealth - healthImpact >= 1.0f && !willLinger) {
-		m_fHealth -= healthImpact;
-		return false;
-	}
-
-	if (bInVehicle) {
-		if (method != WEAPONTYPE_DROWNING) {
-			if (m_pMyVehicle) {
-				CVehicle* pVehicle = m_pMyVehicle;
-				bool bDone = false;
-				if (m_pMyVehicle->IsBike()) {
-					m_fHealth = 0.0f;
-					((CBike*)m_pMyVehicle)->KnockOffRider(method, direction, this, false);
-					bDone = true;
-				} else {
-					if (m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR) {
-						if (m_pMyVehicle->pDriver == this) {
-							if (m_pMyVehicle->GetStatus() == STATUS_SIMPLE) {
-								m_pMyVehicle->SetStatus(STATUS_PHYSICS);
-								CCarCtrl::SwitchVehicleToRealPhysics(m_pMyVehicle);
-							}
-							m_pMyVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
-							m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
-							m_pMyVehicle->AutoPilot.m_nTempAction = TEMPACT_HANDBRAKESTRAIGHT;
-							m_pMyVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 2000;
-						}
-					}
-					if (m_pMyVehicle->CanPedExitCar(true)) {
-						SetObjective(OBJECTIVE_LEAVE_CAR_AND_DIE, m_pMyVehicle);
-					} else {
-						m_fHealth = 0.0f;
-						if (m_pMyVehicle && m_pMyVehicle->pDriver == this) {
-							SetRadioStation();
-							m_pMyVehicle->SetStatus(STATUS_ABANDONED);
-						}
-						SetDie(dieAnim, dieDelta, dieSpeed);
-
-						if (damagedBy == FindPlayerPed() && damagedBy != this) {
-							CWorld::Players[CWorld::PlayerInFocus].m_nHavocLevel += 10;
-							CWorld::Players[CWorld::PlayerInFocus].m_fMediaAttention += 5.f;
-						}
-					}
-				}
-				for (int i = 0; i < ARRAY_SIZE(pVehicle->pPassengers); i++) {
-					CPed* passenger = pVehicle->pPassengers[i];
-					if (passenger && passenger != this && damagedBy)
-						passenger->ReactToAttack(damagedBy);
-				}
-
-				CPed *driverOfVeh = pVehicle->pDriver;
-				if (driverOfVeh && driverOfVeh != this && damagedBy)
-					driverOfVeh->ReactToAttack(damagedBy);
-
-				if (damagedBy == FindPlayerPed() || damagedBy && damagedBy == FindPlayerVehicle()) {
-					CDarkel::RegisterKillByPlayer(this, method, headShot);
-					m_threatEntity = FindPlayerPed();
-				} else {
-					CDarkel::RegisterKillNotByPlayer(this, method);
-				}
-				if (bDone)
-					return true;
-			}
-			m_fHealth = 1.0f;
-			return false;
-		}
-		m_fHealth = 0.0f;
-		if (player == this)
-			m_pMyVehicle->SetStatus(STATUS_PLAYER_DISABLED);
-
-		SetDie(NUM_STD_ANIMS, 4.0f, 0.0f);
-		return true;
-	} else {
-		m_fHealth = 0.0f;
-		SetDie(dieAnim, dieDelta, dieSpeed);
-
-		if (damagedBy == player || damagedBy && damagedBy == FindPlayerVehicle()) {
-			CDarkel::RegisterKillByPlayer(this, method, headShot);
-			CWorld::Players[CWorld::PlayerInFocus].m_nHavocLevel += 10;
-			CWorld::Players[CWorld::PlayerInFocus].m_fMediaAttention += 5.f;
-			m_threatEntity = player;
-		} else {
-			CDarkel::RegisterKillNotByPlayer(this, method);
-		}
-		if (method == WEAPONTYPE_DROWNING) {
-			bIsInTheAir = false;
-			if (FindPlayerPed() == this)
-				CStats::TimesDrowned++;
-		}
-
-		return true;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::ClearFlee(void)
-{
-	RestorePreviousState();
-	bUsePedNodeSeek = false;
-	m_standardTimer = 0;
-	m_fleeTimer = 0;
-}
-
-// --MIAMI: Done
-void
-CPed::ClearFall(void)
-{
-	SetGetUp();
-}
-
-// --MIAMI: Done
-void
-CPed::SetGetUp(void)
-{
-	if (m_nPedState == PED_GETUP && bGetUpAnimStarted)
-		return;
-
-	if (!CanSetPedState())
-		return;
-
-	if (m_fHealth >= 1.0f || IsPedHeadAbovePos(-0.3f)) {
-		if (bUpdateAnimHeading) {
-			m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
-			m_fRotationCur -= HALFPI;
-			bUpdateAnimHeading = false;
-		}
-		if (m_nPedState != PED_GETUP) {
-			SetStoredState();
-			SetPedState(PED_GETUP);
-		}
-
-		CVehicle *collidingVeh = (CVehicle*)m_pCollidingEntity;
-		CVehicle *veh = (CVehicle*)CPedPlacement::IsPositionClearOfCars(&GetPosition());
-		if (veh && veh->m_vehType != VEHICLE_TYPE_BIKE && veh != m_attachedTo ||
-			collidingVeh && collidingVeh->IsVehicle() && collidingVeh->m_vehType != VEHICLE_TYPE_BIKE
-			&& ((uint8)(CTimer::GetFrameCounter() + m_randomSeed + 5) % 8 ||
-				 CCollision::ProcessColModels(GetMatrix(), *GetColModel(), collidingVeh->GetMatrix(), *collidingVeh->GetColModel(),
-					aTempPedColPts, nil, nil) > 0)) {
-
-			bGetUpAnimStarted = false;
-			if (IsPlayer())
-				InflictDamage(nil, WEAPONTYPE_RUNOVERBYCAR, CTimer::GetTimeStep(), PEDPIECE_TORSO, 0);
-			else if(CPad::GetPad(0)->ArePlayerControlsDisabled())
-				InflictDamage(nil, WEAPONTYPE_RUNOVERBYCAR, 1000.0f, PEDPIECE_TORSO, 0);
-			return;
-		}
-		bGetUpAnimStarted = true;
-		m_pCollidingEntity = nil;
-		bKnockedUpIntoAir = false;
-		bKnockedOffBike = false;
-		CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SPRINT);
-		if (animAssoc) {
-			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_RUN)) {
-				CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_RUN, 8.0f);
-			} else {
-				CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 8.0f);
-			}
-			animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-		}
-
-		if (m_nWaitState == WAITSTATE_SUN_BATHE_IDLE) {
-			m_headingRate = 0.0f;
-
-			// TODO(Miami): Looks like that should've been another getup anim but R* forgot it. Visit here later
-			if (bFleeWhenStanding && m_threatEx)
-				animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
-			else
-				animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
-
-		} else if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_GETUP_FRONT, 1000.0f);
-		else
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
-
-		animAssoc->SetFinishCallback(PedGetupCB, this);
-	} else {
-		m_fHealth = 0.0f;
-		SetDie(NUM_STD_ANIMS, 4.0f, 0.0f);
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::ClearInvestigateEvent(void)
-{
-	CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ROAD_CROSS);
-	if (!animAssoc)
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_XPRESS_SCRATCH);
-	if (!animAssoc)
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_HBHB);
-	if (!animAssoc)
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_CHAT);
-	if (animAssoc) {
-		animAssoc->blendDelta = -8.0f;
-		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-	}
-	if (m_eventType > EVENT_EXPLOSION)
-		m_standardTimer = CTimer::GetTimeInMilliseconds() + 15000;
-
-	bGonnaInvestigateEvent = false;
-	m_pEventEntity = nil;
-	ClearLookFlag();
-	RestorePreviousState();
-	if(m_nMoveState == PEDMOVE_NONE || m_nMoveState == PEDMOVE_STILL)
-		SetMoveState(PEDMOVE_WALK);
-}
-
-// --MIAMI: Done
-void
-CPed::ClearLeader(void)
-{
-	if (!m_leader)
-		return;
-
-	m_leader = nil;
-	if (IsPedInControl()) {
-		SetObjective(OBJECTIVE_NONE);
-		if (CharCreatedBy == MISSION_CHAR) {
-			SetIdle();
-		} else {
-			SetWanderPath(CGeneral::GetRandomNumberInRange(0,8));
-		}
-	} else if (m_objective != OBJECTIVE_NONE) {
-		bClearObjective = true;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::ClearLook(void)
-{
-	RestorePreviousState();
-	ClearLookFlag();
-}
-
-// --MIAMI: Done
-void
-CPed::ClearObjective(void)
-{
-	if (IsPedInControl() || m_nPedState == PED_DRIVING) {
-		m_objective = OBJECTIVE_NONE;
-		m_pedInObjective = nil;
-		m_carInObjective = nil;
-
-		if (m_nPedState == PED_DRIVING && m_pMyVehicle) {
-			if (m_pMyVehicle->pDriver != this) {
-				if(!IsPlayer())
-					bWanderPathAfterExitingCar = true;
-
-				SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
-			}
-			m_nLastPedState = PED_NONE;
-		} else {
-			SetIdle();
-			SetMoveState(PEDMOVE_STILL);
-		}
-	} else {
-		bClearObjective = true;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::ClearPause(void)
-{
-	RestorePreviousState();
-}
-
-// --MIAMI: Done
-void
-CPed::ClearSeek(void)
-{
-	SetIdle();
-	bRunningToPhone = false;
-}
-
-// --MIAMI: Done
-bool
-CPed::SetWanderPath(int8 pathStateDest)
-{
-	uint8 nextPathState;
-
-	if (IsPlayer())
-		return false;
-
-	if (IsPedInControl()) {
-		if (bKindaStayInSamePlace) {
-			SetIdle();
-			return false;
-		} else {
-			m_nPathDir = pathStateDest;
-			if (pathStateDest == 0)
-				pathStateDest = CGeneral::GetRandomNumberInRange(1, 7);
-
-			ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode,
-				m_nPathDir, &nextPathState);
-
-			// Circular loop until we find a node for current m_nPathDir
-			while (!m_pNextPathNode) {
-				m_nPathDir = (m_nPathDir+1) % 8;
-
-				// We're at where we started and couldn't find any node
-				if (m_nPathDir == pathStateDest) {
-					ClearAll();
-					SetIdle();
-					return false;
-				}
-				ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode,
-					m_nPathDir, &nextPathState);
-			}
-
-			// We did it, save next path state and return true
-			m_nPathDir = nextPathState;
-			SetPedState(PED_WANDER_PATH);
-			SetMoveState(PEDMOVE_WALK);
-			bIsRunning = false;
-			return true;
-		}
-	} else {
-		m_nPathDir = pathStateDest;
-		bStartWanderPathOnFoot = true;
-		return false;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::ClearWeapons(void)
-{
-	RemoveWeaponModel(-1);
-	for (int i = 0; i < ARRAY_SIZE(m_weapons); i++) {
-		GetWeapon(i).Shutdown();
-	}
-	SetCurrentWeapon(WEAPONTYPE_UNARMED);
-}
-
-// --MIAMI: Done
-void
-CPed::RestoreGunPosition(void)
-{
-	if (bIsLooking) {
-		m_pedIK.m_flags &= ~CPedIK::LOOKAROUND_HEAD_ONLY;
-		bIsRestoringGun = false;
-	} else if (m_pedIK.RestoreGunPosn()) {
-		bIsRestoringGun = false;
-	} else {
-		if (IsPlayer())
-			((CPlayerPed*)this)->m_fFPSMoveHeading = 0.0f;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::RestoreHeadingRate(void)
-{
-	m_headingRate = m_pedStats->m_headingChangeRate;
-}
-
-// --MIAMI: Done
-void
-CPed::RestoreHeadingRateCB(CAnimBlendAssociation *assoc, void *arg)
-{
-	((CPed*)arg)->RestoreHeadingRate();
-}
-
-// --MIAMI: Done
-void
 CPed::RestorePreviousState(void)
 {
 	if (!CanSetPedState() || m_nPedState == PED_FALL)
@@ -5089,5876 +823,919 @@ CPed::RestorePreviousState(void)
 }
 
 // --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;
-}
-
-// --MIAMI: Done
-void
-CPed::SetAimFlag(float angle)
-{
-	bIsAimingGun = true;
-	bIsRestoringGun = false;
-	m_fLookDirection = angle;
-	m_lookTimer = 0;
-	m_pLookTarget = nil;
-	m_pSeekTarget = nil;
-
-	if (bIsDucking)
-		m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
-
-	if (CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_bCanAimWithArm)
-		m_pedIK.m_flags |= CPedIK::AIMS_WITH_ARM;
-	else
-		m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
-}
-
-// --MIAMI: Done
-void
-CPed::SetPointGunAt(CEntity *to)
-{
-	if (to) {
-		SetLookFlag(to, true, true);
-		SetAimFlag(to);
-		SetLookTimer(INT32_MAX);
-	}
-
-	CWeaponInfo* curWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	if (m_nPedState == PED_AIM_GUN || (bIsDucking && !IsPlayer()) || m_nWaitState == WAITSTATE_PLAYANIM_DUCK || curWeapon->m_AnimToPlay == ASSOCGRP_STD)
-		return;
-
-	if (m_nPedState != PED_ATTACK)
-		SetStoredState();
-
-	SetPedState(PED_AIM_GUN);
-	bIsPointingGunAt = true;
-	SetMoveState(PEDMOVE_STILL);
-
-	CAnimBlendAssociation *aimAssoc;
-
-	if (bCrouchWhenShooting && bIsDucking && GetCrouchFireAnim(curWeapon)) {
-		aimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(curWeapon));
-	} else {
-		aimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE);
-	}
-
-	if (!aimAssoc || aimAssoc->blendDelta < 0.0f) {
-		if (bCrouchWhenShooting && bIsDucking && GetCrouchFireAnim(curWeapon)) {
-			aimAssoc = CAnimManager::BlendAnimation(GetClump(), curWeapon->m_AnimToPlay, GetCrouchFireAnim(curWeapon), 4.0f);
-		} else {
-			aimAssoc = CAnimManager::AddAnimation(GetClump(), curWeapon->m_AnimToPlay, ANIM_WEAPON_FIRE);
-		}
-
-		aimAssoc->blendAmount = 0.0f;
-		aimAssoc->blendDelta = 8.0f;
-	}
-	if (to && !IsPlayer())
-		Say(SOUND_PED_ATTACK);
-}
-
-// --MIAMI: Done
-void
-CPed::SetAmmo(eWeaponType weaponType, uint32 ammo)
-{
-	int slot = CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot;
-	if (slot == -1)
-		return;
-
-	GetWeapon(slot).m_nAmmoTotal = ammo;
-	if (weaponType < WEAPONTYPE_TOTALWEAPONS && weaponType > WEAPONTYPE_UNARMED && CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType] >= 0) {
-
-		// Looks like abandoned idea. This block never runs, ms_aMaxAmmoForWeapon is always -1.
-		GetWeapon(slot).m_nAmmoTotal = Min(CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType], GetWeapon(slot).m_nAmmoTotal);
-	} else {
-		GetWeapon(slot).m_nAmmoTotal = Min(99999, GetWeapon(slot).m_nAmmoTotal);
-	}
-	int32 newClip = GetWeapon(slot).m_nAmmoTotal;
-	if (newClip >= GetWeapon(slot).m_nAmmoInClip)
-		newClip = GetWeapon(slot).m_nAmmoInClip;
-	GetWeapon(slot).m_nAmmoInClip = newClip;
-
-	if (GetWeapon(slot).m_eWeaponState == WEAPONSTATE_OUT_OF_AMMO && GetWeapon(slot).m_nAmmoTotal > 0)
-		GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
-}
-
-// --MIAMI: Done
-void
-CPed::GrantAmmo(eWeaponType weaponType, uint32 ammo)
-{
-	int slot = CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot;
-	if (slot == -1)
-		return;
-
-	GetWeapon(slot).m_nAmmoTotal += ammo;
-	if (weaponType < WEAPONTYPE_TOTALWEAPONS && weaponType > WEAPONTYPE_UNARMED && CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType] >= 0) {
-
-		// Looks like abandoned idea. This block never runs, ms_aMaxAmmoForWeapon is always -1.
-		GetWeapon(slot).m_nAmmoTotal = Min(CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType], GetWeapon(slot).m_nAmmoTotal);
-	} else {
-		GetWeapon(slot).m_nAmmoTotal = Min(99999, GetWeapon(slot).m_nAmmoTotal);
-	}
-
-	if (GetWeapon(slot).m_eWeaponState == WEAPONSTATE_OUT_OF_AMMO && GetWeapon(slot).m_nAmmoTotal > 0)
-		GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
-}
-
-// --MIAMI: Done
-void
-CPed::SetEvasiveStep(CEntity *reason, uint8 animType)
-{
-	AnimationId stepAnim;
-
-	if (m_nPedState == PED_STEP_AWAY || !IsPedInControl() || ((IsPlayer() || !bRespondsToThreats) && animType == 0))
-		return;
-
-	float angleToFace = CGeneral::GetRadianAngleBetweenPoints(
-		reason->GetPosition().x, reason->GetPosition().y,
-		GetPosition().x, GetPosition().y);
-	angleToFace = CGeneral::LimitRadianAngle(angleToFace);
-	m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
-	float neededTurn = Abs(angleToFace - m_fRotationCur);
-	bool vehPressedHorn = false;
-
-	if (neededTurn > PI)
-		neededTurn = TWOPI - neededTurn;
-
-	CVehicle *veh = (CVehicle*)reason;
-	if (reason->IsVehicle() && veh->IsCar()) {
-		if (veh->m_nCarHornTimer != 0) {
-			vehPressedHorn = true;
-			if (!IsPlayer())
-				animType = 1;
-		}
-	}
-	if (neededTurn <= DEGTORAD(90.0f) || veh->GetModelIndex() == MI_RCBANDIT || vehPressedHorn || animType != 0) {
-		SetLookFlag(veh, true);
-		if ((CGeneral::GetRandomNumber() & 1) && veh->GetModelIndex() != MI_RCBANDIT && animType == 0) {
-			stepAnim = ANIM_IDLE_TAXI;
-
-		} else {
-			float vehDirection = CGeneral::GetRadianAngleBetweenPoints(
-				veh->m_vecMoveSpeed.x, veh->m_vecMoveSpeed.y,
-				0.0f, 0.0f);
-
-			// Let's turn our back to the "reason"
-			angleToFace += PI;
-
-			if (angleToFace > PI)
-				angleToFace -=  TWOPI;
-
-			// We don't want to run towards car's direction
-			float dangerZone = angleToFace - vehDirection;
-			dangerZone = CGeneral::LimitRadianAngle(dangerZone);
-
-			// So, add or subtract 90deg (jump to left/right) according to that
-			if (dangerZone > 0.0f)
-				angleToFace = vehDirection - HALFPI;
-			else
-				angleToFace = vehDirection + HALFPI;
-
-			stepAnim = NUM_STD_ANIMS;
-			if (animType == 0 || animType == 1)
-				stepAnim = ANIM_EV_STEP;
-			else if (animType == 2)
-				stepAnim = ANIM_HANDSCOWER;
-		}
-		if (!RpAnimBlendClumpGetAssociation(GetClump(), stepAnim)) {
-			CAnimBlendAssociation *stepAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, stepAnim, 8.0f);
-			stepAssoc->flags &= ~ASSOC_DELETEFADEDOUT;
-			stepAssoc->SetFinishCallback(PedEvadeCB, this);
-
-			if (animType == 0)
-				Say(SOUND_PED_EVADE);
-
-			m_fRotationCur = CGeneral::LimitRadianAngle(angleToFace);
-			ClearAimFlag();
-			SetStoredState();
-			SetPedState(PED_STEP_AWAY);
-		}
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump)
-{
-	if (!IsPedInControl() || !bRespondsToThreats)
-		return;
-
-	CAnimBlendAssociation *animAssoc;
-	float angleToFace, neededTurn;
-	bool handsUp = false;
-
-	angleToFace = m_fRotationCur;
-	CVehicle *veh = (CVehicle*) reason;
-	if (reason->IsVehicle() && veh->m_vehType == VEHICLE_TYPE_CAR && veh->m_nCarHornTimer != 0 && !IsPlayer()) {
-		onlyRandomJump = true;
-	}
-
-	if (onlyRandomJump) {
-		if (reason) {
-			// Simple version of my bug fix below. Doesn't calculate "danger zone", selects jump direction randomly.
-			// Also doesn't include random hands up, sound etc. Only used on player ped and peds running from gun shots.
-
-			float vehDirection = CGeneral::GetRadianAngleBetweenPoints(
-				veh->m_vecMoveSpeed.x, veh->m_vecMoveSpeed.y,
-				0.0f, 0.0f);
-			angleToFace = (CGeneral::GetRandomNumber() & 1) * PI + (-0.5f*PI) + vehDirection;
-			angleToFace = CGeneral::LimitRadianAngle(angleToFace);
-		}
-	} else {
-		if (IsPlayer()) {
-			((CPlayerPed*)this)->m_nEvadeAmount = 5;
-			((CPlayerPed*)this)->m_pEvadingFrom = reason;
-			reason->RegisterReference((CEntity**) &((CPlayerPed*)this)->m_pEvadingFrom);
-			return;
-		}
-
-		angleToFace = CGeneral::GetRadianAngleBetweenPoints(
-			reason->GetPosition().x, reason->GetPosition().y,
-			GetPosition().x, GetPosition().y);
-		angleToFace = CGeneral::LimitRadianAngle(angleToFace);
-		m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
-
-		// FIX: Peds no more select dive direction randomly. Taken from SetEvasiveStep, last if statement inverted
-#ifdef FIX_BUGS
-		float vehDirection = CGeneral::GetRadianAngleBetweenPoints(
-			veh->m_vecMoveSpeed.x, veh->m_vecMoveSpeed.y,
-			0.0f, 0.0f);
-
-		// Let's turn our back to the "reason"
-		angleToFace += PI;
-
-		if (angleToFace > PI)
-			angleToFace -= 2 * PI;
-
-		// We don't want to dive towards car's direction
-		float dangerZone = angleToFace - vehDirection;
-		dangerZone = CGeneral::LimitRadianAngle(dangerZone);
-
-		// So, add or subtract 90deg (jump to left/right) according to that
-		if (dangerZone > 0.0f)
-			angleToFace = 0.5f * PI + vehDirection;
-		else
-			angleToFace = vehDirection - 0.5f * PI;
-#endif
-
-		neededTurn = Abs(angleToFace - m_fRotationCur);
-
-		if (neededTurn > PI)
-			neededTurn = 2 * PI - neededTurn;
-
-		if (neededTurn <= 0.5f*PI) {
-			if (CGeneral::GetRandomNumber() & 1)
-				handsUp = true;
-		} else {
-			if (CGeneral::GetRandomNumber() & 7)
-				return;
-		}
-
-		// VC's primitve solution to dive direction problem, see above for better one. This part doesn't exist on III at all
-#ifndef FIX_BUGS
-		angleToFace += HALFPI;
-		if (CGeneral::GetRandomNumber() & 1)
-			angleToFace -= PI;
-#endif
-		Say(SOUND_PED_EVADE);
-	}
-
-	if (handsUp || !IsPlayer() && m_pedStats->m_flags & STAT_NO_DIVE) {
-		m_fRotationCur = angleToFace;
-		ClearLookFlag();
-		ClearAimFlag();
-		SetLookFlag(reason, true);
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_HANDSUP);
-		if (animAssoc)
-			return;
-
-		animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_HANDSUP, 8.0f);
-		animAssoc->flags &= ~ASSOC_DELETEFADEDOUT;
-		animAssoc->SetFinishCallback(PedEvadeCB, this);
-		SetStoredState();
-		SetPedState(PED_STEP_AWAY);
-	} else {
-		m_fRotationCur = angleToFace;
-		ClearLookFlag();
-		ClearAimFlag();
-		SetStoredState();
-		m_nPedState = PED_DIVE_AWAY;
-		animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_EV_DIVE, 8.0f);
-		animAssoc->SetFinishCallback(PedEvadeCB, this);
-	}
-
-	if (reason->IsVehicle() && m_nPedType == PEDTYPE_COP) {
-		if (veh->pDriver && veh->pDriver->IsPlayer()) {
-			CWanted *wanted = FindPlayerPed()->m_pWanted;
-			wanted->RegisterCrime_Immediately(CRIME_RECKLESS_DRIVING, GetPosition(), (uintptr)this, false);
-			wanted->RegisterCrime_Immediately(CRIME_SPEEDING, GetPosition(), (uintptr)this, false);
-		}
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetAttack(CEntity *victim)
-{
-	CPed *victimPed = nil;
-	CWeaponInfo *curWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	CAnimBlendAssociation *animAssoc;
-
-	if (victim && victim->IsPed())
-		victimPed = (CPed*)victim;
-
-	if (m_attackTimer > CTimer::GetTimeInMilliseconds() || m_nWaitState == WAITSTATE_SURPRISE || (bIsDucking && !bCrouchWhenShooting))
-		return;
-
-	if (curWeapon->m_bReload &&
-		(RpAnimBlendClumpGetAssociation(GetClump(), GetReloadAnim(curWeapon)) || RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchReloadAnim(curWeapon)))) {
-		if (!IsPlayer() || m_nPedState != PED_ATTACK || ((CPlayerPed*)this)->m_bHaveTargetSelected)
-			bIsAttacking = false;
-		else
-			bIsAttacking = true;
-
-		return;
-	}
-
-	if (GetWeapon()->m_eWeaponType == WEAPONTYPE_UNARMED || curWeapon->m_bFightMode || GetWeapon()->m_eWeaponType == WEAPONTYPE_BRASSKNUCKLE) {
-		if (IsPlayer() ||
-			(m_nPedState != PED_FIGHT && m_nMoveState != PEDMOVE_NONE && m_nMoveState != PEDMOVE_STILL
-				&& !(m_pedStats->m_flags & STAT_SHOPPING_BAGS) && curWeapon->m_bPartialAttack)) {
-
-			if (m_nPedState != PED_ATTACK) {
-				SetPedState(PED_ATTACK);
-				bIsAttacking = false;
-
-				CAnimBlendAssociation *animAssoc = CAnimManager::BlendAnimation(GetClump(), curWeapon->m_AnimToPlay, ANIM_MELEE_ATTACK_START, 8.0f);
-				animAssoc->SetRun();
-				if (animAssoc->currentTime == animAssoc->hierarchy->totalLength)
-					animAssoc->SetCurrentTime(0.0f);
-
-				animAssoc->SetFinishCallback(FinishedAttackCB, this);
-			}
-		} else {
-			StartFightAttack(CGeneral::GetRandomNumber());
-		}
-		return;
-	}
-
-	if (curWeapon->m_bPartialAttack &&
-		(IsPlayer() && ((CPlayerPed*)this)->m_fMoveSpeed >= 1.0f ||
-		m_nMoveState == PEDMOVE_WALK || m_nMoveState == PEDMOVE_RUN)) {
-
-		if (m_nPedState != PED_ATTACK) {
-			SetPedState(PED_ATTACK);
-			bIsAttacking = false;
-			CAnimBlendAssociation* animAssoc = CAnimManager::BlendAnimation(GetClump(), curWeapon->m_AnimToPlay, ANIM_MELEE_ATTACK_START, 8.0f);
-			animAssoc->SetRun();
-			if (animAssoc->currentTime == animAssoc->hierarchy->totalLength)
-				animAssoc->SetCurrentTime(0.0f);
-
-			animAssoc->SetFinishCallback(FinishedAttackCB, this);
-		}
-		return;
-	}
-
-	if (m_pSeekTarget)
-		m_pSeekTarget->CleanUpOldReference(&m_pSeekTarget);
-	m_pSeekTarget = victim;
-	if (m_pSeekTarget)
-		m_pSeekTarget->RegisterReference((CEntity **) &m_pSeekTarget);
-
-	if (curWeapon->m_bCanAim) {
-		CVector aimPos = GetRight() * 0.1f + GetForward() * 0.2f + GetPosition();
-		aimPos += GetUp() * 0.35f;
-		CEntity *obstacle = CWorld::TestSphereAgainstWorld(aimPos, 0.2f, nil, true, false, false, true, false, false);
-		if (obstacle) {
-			if(gaTempSphereColPoints[0].surfaceB != SURFACE_TRANSPARENT_CLOTH && gaTempSphereColPoints[0].surfaceB != SURFACE_METAL_CHAIN_FENCE &&
-				gaTempSphereColPoints[0].surfaceB != SURFACE_WOOD_BENCH && gaTempSphereColPoints[0].surfaceB != SURFACE_SCAFFOLD_POLE) {
-				if (!IsPlayer()) {
-					bObstacleShowedUpDuringKillObjective = true;
-					m_shootTimer = 0;
-					SetAttackTimer(1500);
-					m_shotTime = CTimer::GetTimeInMilliseconds();
-				}
-				return;
-			}
-		}
-
-		m_pLookTarget = victim;
-		if (victim) {
-			m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
-			m_pSeekTarget->RegisterReference((CEntity **) &m_pSeekTarget);
-		}
-
-		if (m_pLookTarget) {
-			SetAimFlag(m_pLookTarget);
-		} else if (this == FindPlayerPed() && TheCamera.Cams[0].Using3rdPersonMouseCam()) {
-			SetAimFlag(m_fRotationCur);
-			((CPlayerPed*)this)->m_fFPSMoveHeading = TheCamera.Find3rdPersonQuickAimPitch();
-		} else if (curWeapon->m_bCanAimWithArm) {
-			SetAimFlag(m_fRotationCur);
-		}
-	}
-	if (m_nPedState == PED_ATTACK) {
-		bIsAttacking = true;
-		return;
-	}
-
-	if (IsPlayer() || (!victimPed || victimPed->IsPedInControl())) {
-		if (IsPlayer())
-			CPad::GetPad(0)->ResetAverageWeapon();
-
-		PointBlankNecessity pointBlankStatus;
-		if ((curWeapon->m_eWeaponFire == WEAPON_FIRE_INSTANT_HIT || GetWeapon()->m_eWeaponType == WEAPONTYPE_FLAMETHROWER)
-			&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON
-			&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON_RUNABOUT
-			&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER
-			&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER_RUNABOUT
-			&& (pointBlankStatus = CheckForPointBlankPeds(victimPed)) != NO_POINT_BLANK_PED) {
-			ClearAimFlag();
-
-			// This condition is pointless
-			if (pointBlankStatus == POINT_BLANK_FOR_WANTED_PED || !victimPed && (IsPlayer() || !m_carInObjective))
-				StartFightAttack(200);
-		} else {
-			if (!curWeapon->m_bCanAim)
-				m_pSeekTarget = nil;
-
-			if (m_nPedState != PED_AIM_GUN)
-				SetStoredState();
-
-			SetPedState(PED_ATTACK);
-			SetMoveState(PEDMOVE_NONE);
-			if (bCrouchWhenShooting && bIsDucking && !!curWeapon->m_bCrouchFire) {
-				CAnimBlendAssociation* curMoveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(curWeapon));
-				if (curMoveAssoc) {
-					if (strcmp(CAnimManager::GetAnimAssociation(curWeapon->m_AnimToPlay, GetCrouchFireAnim(curWeapon))->hierarchy->name, curMoveAssoc->hierarchy->name) != 0) {
-						delete curMoveAssoc;
-					}
-				}
-				animAssoc = CAnimManager::BlendAnimation(GetClump(), curWeapon->m_AnimToPlay, GetCrouchFireAnim(curWeapon), 8.0f);
-			} else {
-				float animDelta = 8.0f;
-				if (curWeapon->m_eWeaponFire == WEAPON_FIRE_MELEE)
-					animDelta = 1000.0f;
-
-				AnimationId fireAnim;
-				if (curWeapon->m_bThrow)
-					fireAnim = ANIM_THROWABLE_START_THROW;
-				else if (CGame::nastyGame && (curWeapon->m_bGround2nd || curWeapon->m_bGround3rd)) {
-					PedOnGroundState pedOnGround = CheckForPedsOnGroundToAttack(this, nil);
-					if (pedOnGround > PED_IN_FRONT_OF_ATTACKER || pedOnGround == NO_PED && bIsStanding && m_pCurSurface && m_pCurSurface->IsVehicle()) {
-						fireAnim = GetFireAnimGround(curWeapon, false);
-					} else {
-						fireAnim = GetFireAnimNotDucking(curWeapon);
-					}
-				} else {
-					fireAnim = GetFireAnimNotDucking(curWeapon);
-				}
-
-				CAnimBlendAssociation* curFireAssoc = RpAnimBlendClumpGetAssociation(GetClump(), fireAnim);
-				if (curFireAssoc) {
-					if (strcmp(CAnimManager::GetAnimAssociation(curWeapon->m_AnimToPlay, fireAnim)->hierarchy->name, curFireAssoc->hierarchy->name) != 0) {
-						delete curFireAssoc;
-					}
-				}
-				animAssoc = CAnimManager::BlendAnimation(GetClump(), curWeapon->m_AnimToPlay, fireAnim, animDelta);
-			}
-
-			animAssoc->SetRun();
-			if (animAssoc->currentTime == animAssoc->hierarchy->totalLength)
-				animAssoc->SetCurrentTime(0.0f);
-
-			animAssoc->SetFinishCallback(FinishedAttackCB, this);
-		}
-		return;
-	}
-
-	if (GetWeapon()->m_eWeaponType == WEAPONTYPE_BASEBALLBAT && victimPed->m_nPedState == PED_GETUP)
-		SetWaitState(WAITSTATE_SURPRISE, nil);
-
-	SetLookFlag(victim, true, true);
-	SetLookTimer(100);
-}
-
-// --MIAMI: Done
-void
-CPed::StartFightAttack(uint8 buttonPressure)
-{
-	if (!IsPedInControl() || (m_attackTimer > CTimer::GetTimeInMilliseconds() && buttonPressure != 0))
-		return;
-
-	if (m_nPedState == PED_FIGHT) {
-		m_fightButtonPressure = buttonPressure;
-		return;
-	}
-
-	if (m_nPedState != PED_AIM_GUN)
-		SetStoredState();
-
-	if (m_nWaitState != WAITSTATE_FALSE) {
-		ClearWaitState();
-		RestoreHeadingRate();
-	}
-
-	CAnimBlendAssociation* animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_RUN_STOP);
-	if (!animAssoc)
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_RUN_STOP_R);
-
-	if (animAssoc) {
-		RestoreHeadingRate();
-	}
-	SetMoveState(PEDMOVE_NONE);
-	m_nStoredMoveState = PEDMOVE_NONE;
-	bool fightWithWeapon = false;
-	CAnimBlendAssociation *fightIdleAssoc;
-
-	CWeaponInfo* weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	if (GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED) {
-		if (GetFightIdleWithMeleeAnim(weaponInfo)) {
-			fightIdleAssoc = CAnimManager::BlendAnimation(GetClump(), weaponInfo->m_AnimToPlay, GetFightIdleWithMeleeAnim(weaponInfo), 1000.0f);
-			fightWithWeapon = true;
-		} else {
-			fightIdleAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT_IDLE, 1000.0f);
-		}
-	} else {
-		fightIdleAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT_IDLE, 1000.0f);
-	}
-	m_lastFightMove = FIGHTMOVE_IDLE;
-	m_curFightMove = IsPlayer() ? ChooseAttackPlayer(buttonPressure, fightWithWeapon) : ChooseAttackAI(buttonPressure, fightWithWeapon);
-
-	SetPedState(PED_FIGHT);
-	m_fightButtonPressure = 0;
-
-	if (m_curFightMove > FIGHTMOVE_NULL && m_curFightMove != FIGHTMOVE_IDLE) {
-		animAssoc = CAnimManager::BlendAnimation(GetClump(), m_curFightMove < FIGHTMOVE_MELEE1 ? ASSOCGRP_STD : weaponInfo->m_AnimToPlay,
-			tFightMoves[m_curFightMove].animId, 8.0f);
-
-		if (weaponInfo->m_AnimToPlay == ASSOCGRP_KNIFE && m_curFightMove >= FIGHTMOVE_MELEE1) {
-			switch (GetWeapon()->m_eWeaponType) {
-				case WEAPONTYPE_SCREWDRIVER:
-				case WEAPONTYPE_KNIFE:
-					animAssoc->speed = 1.05f;
-					break;
-				case WEAPONTYPE_GOLFCLUB:
-				case WEAPONTYPE_NIGHTSTICK:
-				case WEAPONTYPE_BASEBALLBAT:
-				case WEAPONTYPE_HAMMER:
-				case WEAPONTYPE_KATANA:
-					animAssoc->speed = 0.8f;
-					break;
-				case WEAPONTYPE_CLEAVER:
-				case WEAPONTYPE_MACHETE:
-					animAssoc->speed = 0.9f;
-					break;
-			}
-		} else {
-			if (m_curFightMove == FIGHTMOVE_BACKKICK)
-				animAssoc->speed = 1.15f;
-			else
-				animAssoc->speed = 0.8f;
-		}
-		if (IsPlayer())
-			animAssoc->SetCurrentTime(0.08f);
-
-		animAssoc->SetFinishCallback(FinishFightMoveCB, this);
-	} else {
-		m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 2000;
-	}
-
-	m_fightState = FIGHTSTATE_NO_MOVE;
-	m_takeAStepAfterAttack = false;
-	bIsAttacking = true;
-
-	if (IsPlayer())
-		nPlayerInComboMove = 0;
-}
-
-// --MIAMI: Done
-void
-CPed::LoadFightData(void)
-{
-	float startFireTime, endFireTime, comboFollowOnTime, strikeRadius, extendReachMultiplier;
-	int damage, flags;
-	char line[256], moveName[32], animName[32], hitLevel;
-	int moveId = 0;
-
-	CAnimBlendAssociation *animAssoc;
-
-	size_t bp, buflen;
-	int lp, linelen;
-
-	buflen = CFileMgr::LoadFile("DATA\\fistfite.dat", work_buff, sizeof(work_buff), "r");
-
-	for (bp = 0; bp < buflen; ) {
-		// read file line by line
-		for (linelen = 0; work_buff[bp] != '\n' && bp < buflen; bp++) {
-			line[linelen++] = work_buff[bp];
-		}
-		bp++;
-		line[linelen] = '\0';
-
-		// skip white space
-		for (lp = 0; line[lp] <= ' ' && line[lp] != '\0'; lp++);
-
-		if (line[lp] == '\0' ||
-			line[lp] == '#')
-			continue;
-
-		sscanf(
-			&line[lp],
-			"%s %f %f %f %f %f %c %s %d %d",
-			moveName,
-			&startFireTime,
-			&endFireTime,
-			&comboFollowOnTime,
-			&strikeRadius,
-			&extendReachMultiplier,
-			&hitLevel,
-			animName,
-			&damage,
-			&flags);
-
-		if (strncmp(moveName, "ENDWEAPONDATA", 13) == 0)
-			return;
-
-		tFightMoves[moveId].startFireTime = startFireTime / 30.0f;
-		tFightMoves[moveId].endFireTime = endFireTime / 30.0f;
-		tFightMoves[moveId].comboFollowOnTime = comboFollowOnTime / 30.0f;
-		tFightMoves[moveId].strikeRadius = strikeRadius;
-		tFightMoves[moveId].extendReachMultiplier = extendReachMultiplier;
-		tFightMoves[moveId].damage = damage;
-		tFightMoves[moveId].flags = flags;
-
-		switch (hitLevel) {
-			case 'G':
-				tFightMoves[moveId].hitLevel = HITLEVEL_GROUND;
-				break;
-			case 'H':
-				tFightMoves[moveId].hitLevel = HITLEVEL_HIGH;
-				break;
-			case 'L':
-				tFightMoves[moveId].hitLevel = HITLEVEL_LOW;
-				break;
-			case 'M':
-				tFightMoves[moveId].hitLevel = HITLEVEL_MEDIUM;
-				break;
-			case 'N':
-				tFightMoves[moveId].hitLevel = HITLEVEL_NULL;
-				break;
-			default:
-				break;
-		}
-
-		if (strncmp(animName, "default", 8) != 0) {
-			if (strncmp(animName, "null", 5) != 0) {
-				animAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, animName);
-				tFightMoves[moveId].animId = (AnimationId)animAssoc->animId;
-			} else {
-				tFightMoves[moveId].animId = ANIM_WALK;
-			}
-		}
-		moveId++;
-	}
-}
-
-// --MIAMI: Done
-// Actually GetLocalDirectionTo(Turn/Look)
-int
-CPed::GetLocalDirection(const CVector2D &posOffset)
-{
-	int direction;
-	float angle;
-
-	for (angle = posOffset.Heading() - m_fRotationCur + DEGTORAD(45.0f); angle < 0.0f; angle += TWOPI);
-
-	for (direction = RADTODEG(angle)/90.0f; direction > 3; direction -= 4);
-
-	// 0-forward, 1-left, 2-backward, 3-right.
-	return direction;
-}
-
-// --MIAMI: Done
-bool
-CPed::FightStrike(CVector &touchedNodePos, bool fightWithWeapon)
-{
-	CColModel *hisCol;
-	CVector attackDistance;
-	float maxDistanceToBeat;
-	CPed *nearPed;
-	CVector extendedTouchPoint;
-
-	CWeaponInfo *weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	float radius = tFightMoves[m_curFightMove].strikeRadius;
-	if (fightWithWeapon)
-		radius = weaponInfo->m_fRadius;
-
-	if (m_fightState == FIGHTSTATE_JUST_ATTACKED)
-		return false;
-
-	if (this == FindPlayerPed() && fightWithWeapon && GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED)
-		CGlass::BreakGlassPhysically(touchedNodePos, radius);
-
-	for (int i = 0; i < m_numNearPeds; i++) {
-		int8 pedFound = 0;
-		nearPed = m_nearPeds[i];
-		if (!fightWithWeapon && GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED && GetWeapon()->m_eWeaponType != WEAPONTYPE_BRASSKNUCKLE)
-			maxDistanceToBeat = nearPed->GetBoundRadius() + radius + 0.1f;
-		else
-			maxDistanceToBeat = nearPed->GetBoundRadius() + radius;
-
-		if ((nearPed->bUsesCollision || nearPed->m_nPedState == PED_DEAD) && (m_pedInObjective != FindPlayerPed() || nearPed == FindPlayerPed())) {
-			CVector nearPedCentre;
-
-			// Have to animate a skinned clump because the initial col model is useless
-			hisCol = ((CPedModelInfo*)CModelInfo::GetModelInfo(nearPed->GetModelIndex()))->AnimatePedColModelSkinnedWorld(nearPed->GetClump());
-
-			nearPed->GetBoundCentre(nearPedCentre);
-			CVector potentialAttackDistance = nearPedCentre - touchedNodePos;
-
-			// He can beat us
-			if (sq(maxDistanceToBeat) > potentialAttackDistance.MagnitudeSqr()) {
-
-				for (int j = 0; j < hisCol->numSpheres; j++) {
-					attackDistance = hisCol->spheres[j].center;
-					attackDistance -= touchedNodePos;
-					CColSphere *hisPieces = hisCol->spheres;
-					maxDistanceToBeat = hisPieces[j].radius + radius;
-
-					// We can beat him too
-					if (sq(maxDistanceToBeat) > attackDistance.MagnitudeSqr()) {
-						FightHitPed(nearPed, touchedNodePos, attackDistance, hisPieces[j].piece);
-						pedFound = 1;
-						break;
-					}
-				}
-			}
-			if (!pedFound && !fightWithWeapon) {
-				extendedTouchPoint = touchedNodePos - GetPosition();
-				if (DotProduct(touchedNodePos - GetPosition(), nearPed->GetPosition() - GetPosition()) > 0.f) {
-					if (m_curFightMove == FIGHTMOVE_GROUNDKICK) {
-						extendedTouchPoint += tFightMoves[FIGHTMOVE_GROUNDKICK].extendReachMultiplier * GetForward();
-					} else {
-						extendedTouchPoint.x *= tFightMoves[m_curFightMove].extendReachMultiplier;
-						extendedTouchPoint.y *= tFightMoves[m_curFightMove].extendReachMultiplier;
-					}
-					pedFound = -1;
-					extendedTouchPoint += GetPosition();
-				}
-			}
-			if (pedFound == -1) {
-				CVector nearPedCentre = nearPed->GetBoundCentre();
-				if (sq(maxDistanceToBeat) > (nearPedCentre - extendedTouchPoint).MagnitudeSqr()) {
-
-					for (int j = 0; j < hisCol->numSpheres; j++) {
-						attackDistance = hisCol->spheres[j].center;
-						attackDistance -= extendedTouchPoint;
-						CColSphere* hisPieces = hisCol->spheres;
-						float maxDistanceToBeat2 = hisPieces[j].radius + tFightMoves[m_curFightMove].strikeRadius;
-
-						// We can beat him too
-						if (sq(maxDistanceToBeat2) > attackDistance.MagnitudeSqr()) {
-							FightHitPed(nearPed, extendedTouchPoint, attackDistance, hisPieces[j].piece);
-							break;
-						}
-					}
-				}
-			}
-		}
-	}
-
-
-	if (m_fightState == FIGHTSTATE_NO_MOVE)
-		m_fightState = FIGHTSTATE_1;
-
-	m_vecHitLastPos = *touchedNodePos;
-	return false;
-}
-
-// --MIAMI: Done
-void
-CPed::FightHitPed(CPed *victim, CVector &touchPoint, CVector &dir, int16 piece)
-{
-	if (victim->IsPlayer() && victim->m_nPedState == PED_GETUP)
-		return;
-
-	CWeaponInfo *weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	bool fightingWithWeapon = false;
-	int damageMult = tFightMoves[m_curFightMove].damage * ((CGeneral::GetRandomNumber() & 1) + 2) + 1;
-
-	if (weaponInfo->m_bFightMode) {
-		fightingWithWeapon = true;
-		if (m_curFightMove >= FIGHTMOVE_MELEE1) {
-			damageMult = weaponInfo->m_nDamage;
-			if (m_curFightMove == FIGHTMOVE_MELEE3 && GetWeapon()->m_eWeaponType != WEAPONTYPE_SCREWDRIVER)
-				damageMult *= 5;
-		}
-	}
-
-	if (IsPlayer()) {
-		if (((CPlayerPed*)this)->m_bAdrenalineActive)
-			damageMult = 20;
-	} else if (!fightingWithWeapon) {
-		damageMult *= m_pedStats->m_attackStrength;
-	}
-
-	float oldVictimHealth = victim->m_fHealth;
-	CVector bloodPos = 0.5f * dir + touchPoint;
-	CVector2D diff(GetPosition() - victim->GetPosition());
-	int direction = victim->GetLocalDirection(diff);
-
-	bool brassKnucklePunch = false;
-	if (GetWeapon()->m_eWeaponType == WEAPONTYPE_BRASSKNUCKLE) {
-		if (m_curFightMove == FIGHTMOVE_PUNCHHOOK || m_curFightMove == FIGHTMOVE_PUNCHJAB || m_curFightMove == FIGHTMOVE_BACKLEFT ||
-			m_curFightMove == FIGHTMOVE_STDPUNCH || m_curFightMove == FIGHTMOVE_PUNCH) {
-			brassKnucklePunch = true;
-			damageMult *= 1.5f;
-		}
-	}
-	victim->ReactToAttack(this);
-
-	// Mostly unused. if > 5, ANIM_HIT_BIGSTEP will be run, that's it.
-	int unk2;
-	if (GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED && GetWeapon()->m_eWeaponType != WEAPONTYPE_BRASSKNUCKLE &&
-		!victim->IsPlayer() && !fightingWithWeapon)
-		unk2 = 101;
-	else
-		unk2 = damageMult;
-
-	victim->StartFightDefend(direction, tFightMoves[m_curFightMove].hitLevel, unk2);
-	PlayHitSound(victim);
-	m_fightState = FIGHTSTATE_JUST_ATTACKED;
-	RpAnimBlendClumpGetAssociation(GetClump(), tFightMoves[m_curFightMove].animId)->speed = 0.6f;
-
-	if (!victim->DyingOrDead()) {
-		if(fightingWithWeapon)
-			victim->InflictDamage(this, GetWeapon()->m_eWeaponType, damageMult, (ePedPieceTypes)piece, direction);
-		else
-			victim->InflictDamage(this, WEAPONTYPE_UNARMED, damageMult * 3.0f, (ePedPieceTypes)piece, direction);
-	}
-
-	if (CGame::nastyGame && weaponInfo->m_AnimToPlay == ASSOCGRP_KNIFE && m_curFightMove >= FIGHTMOVE_MELEE1
-		&& victim->GetIsOnScreen()) {
-
-		static float particleRightLen = 0.05f;
-		static float particleUpLen = 0.05f;
-
-		// Just for particles. We will restore it below.
-		dir /= (20.0f * dir.Magnitude());
-		if (m_curFightMove == FIGHTMOVE_MELEE1) {
-			float rightMult = -particleRightLen;
-			dir += particleUpLen * GetUp() + rightMult * GetRight();
-
-		} else if (m_curFightMove == FIGHTMOVE_MELEE2) {
-			float upMult = 2.0f * particleUpLen;
-			dir += particleRightLen * GetRight() + upMult * GetUp();
-		}
-		CParticle::AddParticle(PARTICLE_BLOOD_SPURT, bloodPos, dir, nil, 0.0f, 0, 0, 0, 0);
-		CParticle::AddParticle(PARTICLE_BLOOD_SPURT, bloodPos, dir, nil, 0.0f, 0, 0, 0, 0);
-		if (IsPlayer()) {
-			CParticle::AddParticle(PARTICLE_BLOOD_SPURT, bloodPos, dir, nil, 0.0f, 0, 0, 0, 0);
-			CParticle::AddParticle(PARTICLE_BLOOD_SPURT, bloodPos, dir, nil, 0.0f, 0, 0, 0, 0);
-		}
-		if (!(CGeneral::GetRandomNumber() & 3)) {
-			CParticle::AddParticle(PARTICLE_TEST, bloodPos, dir, nil, 0.0f, 0, 0, 0, 0);
-		}
-	} else if (CGame::nastyGame && (tFightMoves[m_curFightMove].hitLevel > HITLEVEL_MEDIUM || fightingWithWeapon)
-			&& victim->GetIsOnScreen()) {
-
-		// Just for particles. We will restore it below.
-		dir /= (10.0f * dir.Magnitude());
-		for (int i = 0; i < 4; i++) {
-			CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, dir, nil, 0.0f, 0, 0, 0, 0);
-		}
-	}
-
-	eWeaponType weaponType = GetWeapon()->m_eWeaponType;
-	if (!fightingWithWeapon) {
-		if (!victim->OnGround()) {
-			float curVictimHealth = victim->m_fHealth;
-			if (curVictimHealth > 0.0f
-				&& (curVictimHealth < 30.0f && oldVictimHealth > 30.0f
-					|| weaponType != WEAPONTYPE_UNARMED && weaponType != WEAPONTYPE_BRASSKNUCKLE && IsPlayer()
-					|| victim->m_pedStats->m_flags & STAT_ONE_HIT_KNOCKDOWN || brassKnucklePunch)) {
-
-				victim->SetFall(0, (AnimationId)(direction + ANIM_KO_SKID_FRONT), 0);
-				if (victim->m_nPedState == PED_FALL)
-					victim->bIsStanding = false;
-			}
-		}
-	}
-
-	if (victim->m_nPedState == PED_DIE || !victim->bIsStanding) {
-		dir = victim->GetPosition() - GetPosition();
-		dir.Normalise();
-		dir.z = 1.0f;
-		victim->bIsStanding = false;
-
-		float moveMult;
-		if (fightingWithWeapon) {
-			moveMult = Min(damageMult * 0.02f, 1.0f);
-		} else if (m_curFightMove == FIGHTMOVE_GROUNDKICK) {
-			moveMult = Min(damageMult * 0.6f, 4.0f);
-		} else {
-			if (victim->m_nPedState != PED_DIE || damageMult >= 20) {
-				moveMult = damageMult;
-			} else {
-				moveMult = Min(damageMult * 2.0f, 14.0f);
-			}
-		}
-
-		victim->ApplyMoveForce(moveMult * 0.6 * dir);
-	}
-
-	if (weaponType != WEAPONTYPE_KNIFE && weaponType != WEAPONTYPE_MACHETE
-		&& weaponType != WEAPONTYPE_KATANA && weaponType != WEAPONTYPE_CHAINSAW) {
-
-		if (victim->m_nPedType == PEDTYPE_COP)
-			CEventList::RegisterEvent(EVENT_ASSAULT_POLICE, EVENT_ENTITY_PED, victim, this, 2000);
-		else
-			CEventList::RegisterEvent(EVENT_ASSAULT, EVENT_ENTITY_PED, victim, this, 2000);
-	} else {
-		if (victim->m_nPedType == PEDTYPE_COP)
-			CEventList::RegisterEvent(EVENT_ASSAULT_NASTYWEAPON_POLICE, EVENT_ENTITY_PED, victim, this, 2000);
-		else
-			CEventList::RegisterEvent(EVENT_ASSAULT_NASTYWEAPON, EVENT_ENTITY_PED, victim, this, 2000);
-	}
-}
-
-// --MIAMI: Done
-int32
-CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon)
-{
-	CWeaponInfo *weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	const float maxAttackDist = 2.7f;
-	float weaponAttackDist = 2.0f;
-	CPed *victimPed = nil;
-	CPed *walkUpTo = nil;
-	CPed *groundAttackDeadPed = nil;
-	CPed *groundAttackAlivePed = nil;
-	if (fightWithWeapon)
-		weaponAttackDist = weaponInfo->m_fRange;
-
-	bool willWalkUp = false;
-	PedFightMoves choosenMove = FIGHTMOVE_IDLE;
-	int numPedsWeCanReach = 0;
-	if (m_takeAStepAfterAttack)
-		willWalkUp = true;
-
-	float groundAttackDeadAngle, groundAttackAliveAngle, walkAngle, victimAngle, distToVictim;
-
-	for (int i = 0; i < m_numNearPeds; ++i) {
-		CPed *nearPed = m_nearPeds[i];
-		CVector distVec(nearPed->GetPosition() - GetPosition());
-		float dist = distVec.Magnitude();
-		if (dist < maxAttackDist) {
-			float nearPedAngle = CGeneral::LimitRadianAngle(distVec.Heading());
-			m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
-			float neededTurn = Abs(nearPedAngle - m_fRotationCur);
-			if (neededTurn > PI)
-				neededTurn = TWOPI - neededTurn;
-
-			if (!nearPed->OnGroundOrGettingUp() && nearPed->m_nWaitState != WAITSTATE_SUN_BATHE_IDLE) {
-				if (!willWalkUp || neededTurn <= DEGTORAD(45.0f)) {
-
-					if (neededTurn <= DEGTORAD(30.0f) || nearPed->m_pedInObjective == this
-						&& (nearPed->m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || nearPed->m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS)) {
-
-						if (dist < weaponAttackDist) {
-							if (!victimPed
-								|| nearPed->m_attackTimer < victimPed->m_attackTimer && nearPed->m_attackTimer > CTimer::GetTimeInMilliseconds() - 100) {
-								victimPed = nearPed;
-								victimAngle = nearPedAngle;
-								distToVictim = dist;
-							}
-							++numPedsWeCanReach;
-							
-						} else {
-							if (neededTurn < DEGTORAD(30.0f)) {
-								walkUpTo = nearPed;
-								walkAngle = nearPedAngle;
-							}
-						}
-					}
-				}
-			} else if (CGame::nastyGame && dist < 1.2f && neededTurn < DEGTORAD(55.0f)) {
-				if (!nearPed->DyingOrDead() || groundAttackDeadPed) {
-					if (!nearPed->IsPedHeadAbovePos(-0.3f)) {
-						groundAttackAlivePed = nearPed;
-						groundAttackAliveAngle = nearPedAngle;
-					}
-				} else {
-					groundAttackDeadPed = nearPed;
-					groundAttackDeadAngle = nearPedAngle;
-				}
-				++numPedsWeCanReach;
-
-			} else if (dist > 1.4f && dist < maxAttackDist && neededTurn < DEGTORAD(30.0f)) {
-				if (!walkUpTo) {
-					walkUpTo = nearPed;
-					walkAngle = nearPedAngle;
-				}
-#ifdef FIX_BUGS
-				if(dist < 2.1f)
-#endif
-				++numPedsWeCanReach;
-			}
-		}
-	}
-
-	if (victimPed) {
-		float adjustedAngleDiff = victimAngle - m_fRotationCur + DEGTORAD(30.0f);
-		if (adjustedAngleDiff < 0.0f)
-			adjustedAngleDiff += TWOPI;
-
-		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) {
-			float angleDiff = Abs(victimAngle - m_fRotationCur);
-			if (angleDiff > PI)
-				angleDiff = TWOPI - angleDiff;
-
-			if (angleDiff < DEGTORAD(60.0f))
-				dir = 0; // forward
-		}
-		int16 randVal = CGeneral::GetRandomNumber() & 3;
-		switch (dir) {
-			case 0: // forward
-				if (fightWithWeapon) {
-					if (distToVictim < 0.95f - 0.2f && m_nPedState == PED_FIGHT) {
-						choosenMove = FIGHTMOVE_KNEE;
-					} else {
-						if (GetWeapon()->m_eWeaponType == WEAPONTYPE_CLEAVER) {
-							if (distToVictim < 0.85f * weaponInfo->m_fRange)
-								choosenMove = FIGHTMOVE_MELEE1;
-							else
-								choosenMove = FIGHTMOVE_SHUFFLE_F;
-						} else {
-							float weaponRange = weaponInfo->m_fRange;
-							if (distToVictim < 0.75f * weaponRange && GetWeapon()->m_eWeaponType != WEAPONTYPE_SCREWDRIVER) {
-								if (m_lastFightMove == FIGHTMOVE_MELEE1 && GetFinishingAttackAnim(weaponInfo)) {
-									choosenMove = FIGHTMOVE_MELEE2;
-								} else if (m_lastFightMove == FIGHTMOVE_MELEE2 && GetFinishingAttackAnim(weaponInfo)) {
-									choosenMove = FIGHTMOVE_MELEE3;
-								} else {
-									choosenMove = FIGHTMOVE_MELEE1;
-								}
-							} else if (distToVictim < weaponRange && GetFinishingAttackAnim(weaponInfo)) {
-								choosenMove = FIGHTMOVE_MELEE3;
-							} else {
-								choosenMove = FIGHTMOVE_SHUFFLE_F;
-							}
-						}
-					}
-				} else if (distToVictim < 0.95f && m_nPedState == PED_FIGHT) {
-					choosenMove = FIGHTMOVE_KNEE;
-
-				} else if (distToVictim < 1.4f) {
-					if (m_curFightMove == FIGHTMOVE_PUNCHJAB) {
-						choosenMove = FIGHTMOVE_PUNCH;
-
-					} else if (m_curFightMove != FIGHTMOVE_PUNCH || randVal != 1) {
-						if (randVal == 2)
-							choosenMove = FIGHTMOVE_PUNCH;
-						else
-							choosenMove = FIGHTMOVE_PUNCHJAB;
-					} else {
-						choosenMove = FIGHTMOVE_LONGKICK;
-					}
-				} else {
-					choosenMove = FIGHTMOVE_LONGKICK;
-				}
-				break;
-			case 1:
-				choosenMove = FIGHTMOVE_FWDLEFT;
-				break;
-			case 2:
-				choosenMove = FIGHTMOVE_BACKLEFT;
-				break;
-			case 3:
-				choosenMove = FIGHTMOVE_BACKKICK;
-				break;
-			case 4:
-				choosenMove = FIGHTMOVE_BACKRIGHT;
-				break;
-			default:
-				choosenMove = FIGHTMOVE_FWDRIGHT;
-				break;
-		}
-
-		// forward
-		if (dir == 0) {
-			m_fRotationDest = CGeneral::LimitRadianAngle(victimAngle);
-		} else {
-			m_fRotationDest = victimAngle - dir * DEGTORAD(60.0f);
-			m_fRotationDest = CGeneral::LimitRadianAngle(m_fRotationDest);
-		}
-		
-		m_fRotationCur = m_fRotationDest;
-		Say(SOUND_PED_ATTACK);
-
-	} else if (groundAttackAlivePed || groundAttackDeadPed) {
-		if (fightWithWeapon && weaponInfo->m_bGround2nd) {
-			choosenMove = FIGHTMOVE_MELEE2;
-		} else if (fightWithWeapon && weaponInfo->m_bGround3rd) {
-			choosenMove = FIGHTMOVE_MELEE3;
-		} else {
-			choosenMove = FIGHTMOVE_GROUNDKICK;
-		}
-		if (groundAttackAlivePed)
-			m_fRotationDest = groundAttackAliveAngle;
-		else
-			m_fRotationDest = groundAttackDeadAngle;
-
-		m_fRotationCur = m_fRotationDest;
-		m_lookTimer = 0;
-		if (groundAttackAlivePed)
-			SetLookFlag(groundAttackAlivePed, 1, 0);
-		else
-			SetLookFlag(groundAttackDeadPed, 1, 0);
-
-		SetLookTimer(1500u);
-
-	} else if (walkUpTo) {
-		choosenMove = FIGHTMOVE_SHUFFLE_F;
-		m_fRotationCur = m_fRotationDest = walkAngle;
-		m_lookTimer = 0;
-		SetLookFlag(walkUpTo, true);
-		SetLookTimer(1500);
-
-	} else if (fightWithWeapon) {
-		// No enemy, fight with space
-		if (GetWeapon()->m_eWeaponType == WEAPONTYPE_SCREWDRIVER) {
-			choosenMove = FIGHTMOVE_MELEE3;
-		} else {
-			if (m_lastFightMove == FIGHTMOVE_MELEE1 && GetFinishingAttackAnim(weaponInfo)) {
-				choosenMove = FIGHTMOVE_MELEE2;
-			} else if (m_lastFightMove == FIGHTMOVE_MELEE2 && GetFinishingAttackAnim(weaponInfo)) {
-				choosenMove = FIGHTMOVE_MELEE3;
-			} else {
-				choosenMove = FIGHTMOVE_MELEE1;
-			}
-		}
-	} else {
-		// Max number GetRandomNumberInRange returns is max-1
-#ifdef FIX_BUGS
-		switch (CGeneral::GetRandomNumberInRange(0,4)) {
-#else
-		switch (CGeneral::GetRandomNumberInRange(0,3)) {
-#endif
-			case 0:
-				choosenMove = FIGHTMOVE_PUNCHJAB;
-				break;
-			case 1:
-				choosenMove = FIGHTMOVE_PUNCH;
-				break;
-			case 2:
-				choosenMove = FIGHTMOVE_LONGKICK;
-				break;
-			case 3:
-				choosenMove = FIGHTMOVE_KNEE;
-				break;
-			default:
-				break;
-		}
-	}
-	return choosenMove;
-}
-
-// --MIAMI: Done
-int32
-CPed::ChooseAttackAI(uint8 buttonPressure, bool fightWithWeapon)
+uint32
+CPed::ScanForThreats(void)
 {
-	eWeaponType weapon = GetWeapon()->m_eWeaponType;
-	CWeaponInfo *weaponInfo = CWeaponInfo::GetWeaponInfo(weapon);
-	if (!fightWithWeapon && weapon != WEAPONTYPE_UNARMED && weapon != WEAPONTYPE_BRASSKNUCKLE) {
-		return FIGHTMOVE_PUNCH;
+	int fearFlags = m_fearFlags;
+	CVector ourPos = GetPosition();
+	float closestPedDist = 60.0f;
+	CVector2D explosionPos = GetPosition();
+	if (fearFlags & PED_FLAG_EXPLOSION && CheckForExplosions(explosionPos)) {
+		m_eventOrThreat = explosionPos;
+		return PED_FLAG_EXPLOSION;
 	}
-
-	if (!m_pedInObjective)
-		return FIGHTMOVE_IDLE;
-	if (buttonPressure == 0)
-		return FIGHTMOVE_IDLE;
-
-	uint16 pedFeatures = m_pedStats->m_flags;
-	bool punchOnly = !!(pedFeatures & STAT_PUNCH_ONLY);
-	bool canRoundhouse = !!(pedFeatures & STAT_CAN_ROUNDHOUSE);
-	bool canKneeHead = !!(pedFeatures & STAT_CAN_KNEE_HEAD);
-	bool canKick = !!(pedFeatures & STAT_CAN_KICK);
-	bool hasShoppingBags = !!(pedFeatures & STAT_SHOPPING_BAGS);
-
-	CVector distVec(m_pedInObjective->GetPosition() - GetPosition());
-	float dist = distVec.Magnitude();
-	m_fRotationDest = CGeneral::LimitRadianAngle(distVec.Heading());
-	m_fRotationCur = m_fRotationDest;
-
-	if (fightWithWeapon) {
-		if (m_pedInObjective->OnGroundOrGettingUp()) {
-			if (CGame::nastyGame && dist < 1.2f && !m_pedInObjective->IsPlayer()
-				&& (m_pedInObjective->m_nPedState == PED_DEAD || !m_pedInObjective->IsPedHeadAbovePos(-0.3f))) {
-				if (weaponInfo->m_bGround2nd)
-					return FIGHTMOVE_MELEE2;
-				if (weaponInfo->m_bGround3rd)
-					return FIGHTMOVE_MELEE3;
-
-				return FIGHTMOVE_GROUNDKICK;
-			} else {
-				return FIGHTMOVE_IDLE;
-			}
-		}
-		if (dist < 2.f) {
-			if (m_curFightMove == FIGHTMOVE_MELEE1) {
-				if (GetSecondFireAnim(weaponInfo))
-					return FIGHTMOVE_MELEE2;
-			}
-			if (m_curFightMove == FIGHTMOVE_MELEE2) {
-				if (GetFinishingAttackAnim(weaponInfo))
-					return FIGHTMOVE_MELEE3;
+	
+	if (fearFlags & PED_FLAG_GUN) {
+		CPed *shooter = CheckForGunShots();
+		if (shooter && (m_nPedType != shooter->m_nPedType || m_nPedType == PEDTYPE_CIVMALE || m_nPedType == PEDTYPE_CIVFEMALE)) {
+			if (!IsGangMember()) {
+				m_threatEntity = shooter;
+				m_threatEntity->RegisterReference((CEntity**)&m_threatEntity);
+				return PED_FLAG_GUN;
 			}
-			return FIGHTMOVE_MELEE1;
-		}
-		return FIGHTMOVE_SHUFFLE_F;
-	}
-	if (!hasShoppingBags) {
-		if (punchOnly) {
-			if (dist < 1.4f)
-				return FIGHTMOVE_PUNCH;
-		} else {
-			if (m_pedInObjective->OnGroundOrGettingUp()) {
-				if (CGame::nastyGame && dist < 1.2f && !m_pedInObjective->IsPlayer()
-					&& (m_pedInObjective->m_nPedState == PED_DEAD || !m_pedInObjective->IsPedHeadAbovePos(-0.3f))) {
 
-					return FIGHTMOVE_GROUNDKICK;
-				} else {
-					return FIGHTMOVE_IDLE;
-				}
-			}
-			if (dist < 0.95f && canKneeHead)
-				return FIGHTMOVE_KNEE;
-			if (dist < 1.4f)
-				return FIGHTMOVE_PUNCH;
-			if (dist < 2.f && canKick) {
-				int nextMove = FIGHTMOVE_LONGKICK;
-				if (canRoundhouse && CGeneral::GetRandomNumber() & 1)
-					nextMove = FIGHTMOVE_ROUNDHOUSE;
-				return nextMove;
+			if (CPedType::GetFlag(shooter->m_nPedType) & fearFlags || m_nPedType == PEDTYPE_GANG5) {
+				if (m_threatEntity)
+					m_threatEntity->CleanUpOldReference(&m_threatEntity);
+				m_threatEntity = shooter;
+				m_threatEntity->RegisterReference((CEntity**)&m_threatEntity);
+				return CPedType::GetFlag(shooter->m_nPedType);
 			}
 		}
-		return FIGHTMOVE_SHUFFLE_F;
 	}
-	if (dist < 2.f)
-		return FIGHTMOVE_ROUNDHOUSE;
-	else
-		return FIGHTMOVE_SHUFFLE_F;
-}
 
-// --MIAMI: Done
-void
-CPed::SetFall(int extraTime, AnimationId animId, uint8 evenIfNotInControl)
-{
-	if (m_attachedTo)
-		return;
-
-	if (!IsPedInControl() && (!evenIfNotInControl || DyingOrDead()))
-		return;
-
-	ClearLookFlag();
-	ClearAimFlag();
-	SetStoredState();
-	SetPedState(PED_FALL);
-	CAnimBlendAssociation *fallAssoc = nil;
-	if (animId == NUM_STD_ANIMS) {
-		if (IsPlayer()) {
-			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_LHS);
-			if (!fallAssoc)
-				fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_RHS);
-		}
-	} else {
-		fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), animId);
-
-		if (fallAssoc) {
-			fallAssoc->SetCurrentTime(0.0f);
-			fallAssoc->blendAmount = 0.0f;
-			fallAssoc->blendDelta = 8.0f;
-			fallAssoc->SetRun();
-		}
-		else {
-			fallAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animId, 8.0f);
-		}
-		if (animId == ANIM_BIKE_FALL_R)
-			fallAssoc->SetCurrentTime(0.4f);
-	}
-
-	if (extraTime == -1) {
-		m_getUpTimer = UINT32_MAX;
-	} else if (fallAssoc) {
-		if (IsPlayer()) {
-			if (fallAssoc->animId == ANIM_CAR_ROLLOUT_LHS || fallAssoc->animId == ANIM_CAR_ROLLOUT_RHS) {
-				m_getUpTimer = 1000.0f * fallAssoc->hierarchy->totalLength
-					+ CTimer::GetTimeInMilliseconds()
-					- 1000.0f * fallAssoc->currentTime
-					+ 100.0f;
-			} else {
-				m_getUpTimer = 1000.0f * fallAssoc->hierarchy->totalLength
-					+ CTimer::GetTimeInMilliseconds()
-					+ 500.0f;
-			}
-		} else {
-			m_getUpTimer = 1000.0f * fallAssoc->hierarchy->totalLength
-				+ CTimer::GetTimeInMilliseconds()
-				+ extraTime
-				+ ((m_randomSeed + CTimer::GetFrameCounter()) % 1000);
-		}
+	CPed *deadPed = nil;
+	if (fearFlags & PED_FLAG_DEADPEDS && CharCreatedBy != MISSION_CHAR
+		&& (deadPed = CheckForDeadPeds()) != nil && (deadPed->GetPosition() - ourPos).MagnitudeSqr() < sq(20.0f)) {
+		m_pEventEntity = deadPed;
+		m_pEventEntity->RegisterReference((CEntity **) &m_pEventEntity);
+		return PED_FLAG_DEADPEDS;
 	} else {
-		m_getUpTimer = extraTime
-			+ CTimer::GetTimeInMilliseconds()
-			+ 1000
-			+ ((m_randomSeed + CTimer::GetFrameCounter()) % 1000);
-	}
-	bFallenDown = true;
-}
-
-// --MIAMI: Done
-void
-CPed::SetFlee(CEntity *fleeFrom, int time)
-{
-	if (!IsPedInControl() || bKindaStayInSamePlace || !fleeFrom)
-		return;
-
-	SetStoredState();
-	SetPedState(PED_FLEE_ENTITY);
-	bUsePedNodeSeek = true;
-	SetMoveState(PEDMOVE_RUN);
-	m_fleeFrom = fleeFrom;
-	m_fleeFrom->RegisterReference((CEntity **) &m_fleeFrom);
-
-	if (time <= 0)
-		m_fleeTimer = 0;
-	else
-		m_fleeTimer = CTimer::GetTimeInMilliseconds() + time;
-
-	float angleToFace = CGeneral::GetRadianAngleBetweenPoints(
-			GetPosition().x, GetPosition().y,
-			fleeFrom->GetPosition().x, fleeFrom->GetPosition().y);
-
-	m_fRotationDest = CGeneral::LimitRadianAngle(angleToFace);
-	if (m_fRotationCur - PI > m_fRotationDest) {
-		m_fRotationDest += 2 * PI;
-	} else if (PI + m_fRotationCur < m_fRotationDest) {
-		m_fRotationDest -= 2 * PI;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetFlee(CVector2D const &from, int time)
-{
-	if (CTimer::GetTimeInMilliseconds() < m_nPedStateTimer || !IsPedInControl() || bKindaStayInSamePlace)
-		return;
-
-	if (m_nPedState != PED_FLEE_ENTITY) {
-		SetStoredState();
-		SetPedState(PED_FLEE_POS);
-		SetMoveState(PEDMOVE_RUN);
-		m_fleeFromPos = from;
-	}
-
-	bUsePedNodeSeek = true;
-	m_pNextPathNode = nil;
-	m_fleeTimer = CTimer::GetTimeInMilliseconds() + time;
-
-	float angleToFace = CGeneral::GetRadianAngleBetweenPoints(
-		GetPosition().x, GetPosition().y,
-		from.x, from.y);
-
-	m_fRotationDest = CGeneral::LimitRadianAngle(angleToFace);
-	if (m_fRotationCur - PI > m_fRotationDest) {
-		m_fRotationDest += 2 * PI;
-	} else if (PI + m_fRotationCur < m_fRotationDest) {
-		m_fRotationDest -= 2 * PI;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetWaitState(eWaitState state, void *time)
-{
-	AnimationId waitAnim = NUM_STD_ANIMS;
-	CAnimBlendAssociation *animAssoc;
-
-	if (!IsPedInControl())
-		return;
-
-	if (m_nWaitState == WAITSTATE_RIOT && state != WAITSTATE_FALSE)
-		return;
-
-	if (state != m_nWaitState)
-		FinishedWaitCB(nil, this);
-
-	switch (state) {
-		case WAITSTATE_TRAFFIC_LIGHTS:
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 500;
-			SetMoveState(PEDMOVE_STILL);
-			break;
-		case WAITSTATE_CROSS_ROAD:
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 1000;
-			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_HBHB, 4.0f);
-			break;
-		case WAITSTATE_CROSS_ROAD_LOOK:
-			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_ROAD_CROSS, 8.0f);
-
-			if (time)
-				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
-			else
-				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(2000,5000);
-
-			break;
-		case WAITSTATE_LOOK_PED:
-		case WAITSTATE_LOOK_SHOP:
-		case WAITSTATE_LOOK_ACCIDENT:
-		case WAITSTATE_FACEOFF_GANG:
-		case WAITSTATE_RIOT:
-		case WAITSTATE_STRIPPER:
-			break;
-		case WAITSTATE_DOUBLEBACK:
-			m_headingRate = 0.0f;
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 3500;
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_HBHB, 4.0f);
-#ifdef FIX_BUGS
-			animAssoc->SetFinishCallback(RestoreHeadingRateCB, this);
-#endif
-			break;
-		case WAITSTATE_HITWALL:
-			m_headingRate = 2.0f;
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_HIT_WALL, 16.0f);
-			animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-			animAssoc->flags |= ASSOC_FADEOUTWHENDONE;
-			animAssoc->SetDeleteCallback(FinishedWaitCB, this);
-
-			if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && CharCreatedBy == RANDOM_CHAR && m_nPedState == PED_SEEK_CAR) {
-				ClearObjective();
-				RestorePreviousState();
-				m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 30000;
-			}
-			break;
-		case WAITSTATE_TURN180:
-			m_headingRate = 0.0f;
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_TURN_180, 4.0f);
-			animAssoc->SetFinishCallback(FinishedWaitCB, this);
-			break;
-		case WAITSTATE_SURPRISE:
-			m_headingRate = 0.0f;
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 2000;
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_HIT_WALL, 4.0f);
-			animAssoc->SetFinishCallback(FinishedWaitCB, this);
-			break;
-		case WAITSTATE_STUCK:
-			SetMoveState(PEDMOVE_STILL);
-			SetMoveAnim();
-			m_headingRate = 0.0f;
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_TIRED, 4.0f);
-#ifdef FIX_BUGS
-			animAssoc->SetFinishCallback(RestoreHeadingRateCB, this);
-#endif
-
-			// Random char as passenger? Cop, medic etc.?
-			if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && CharCreatedBy == RANDOM_CHAR && m_nPedState == PED_SEEK_CAR) {
-				ClearObjective();
-				RestorePreviousState();
-				m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 30000;
-			}
-			break;
-		case WAITSTATE_LOOK_ABOUT:
-			SetMoveState(PEDMOVE_STILL);
-			SetMoveAnim();
-			m_headingRate = 0.0f;
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_HBHB, 4.0f);
-#ifdef FIX_BUGS
-			animAssoc->SetFinishCallback(RestoreHeadingRateCB, this);
-#endif
-
-			break;
-		case WAITSTATE_PLAYANIM_COWER:
-			waitAnim = ANIM_HANDSCOWER;
-		case WAITSTATE_PLAYANIM_HANDSUP:
-			if (waitAnim == NUM_STD_ANIMS)
-				waitAnim = ANIM_HANDSUP;
-		case WAITSTATE_PLAYANIM_HANDSCOWER:
-			if (waitAnim == NUM_STD_ANIMS)
-				waitAnim = ANIM_HANDSCOWER;
-			m_headingRate = 0.0f;
-			if (time)
-				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
-			else
-				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 3000;
+		uint32 flagsOfSomePed = 0;
 
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, waitAnim, 4.0f);
-			animAssoc->SetDeleteCallback(FinishedWaitCB, this);
-			break;
-		case WAITSTATE_PLAYANIM_DUCK:
-			waitAnim = ANIM_DUCK_DOWN;
-		case WAITSTATE_PLAYANIM_TAXI:
-			if (waitAnim == NUM_STD_ANIMS)
-				waitAnim = ANIM_IDLE_TAXI;
-		case WAITSTATE_PLAYANIM_CHAT:
-			if (waitAnim == NUM_STD_ANIMS)
-				waitAnim = ANIM_IDLE_CHAT;
-			if (time)
-				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
-			else
-				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 3000;
+		CPed *pedToFearFrom = nil;
+		bool weSawOurEnemy = false;
+		bool weMaySeeOurEnemy = false;
+		float closestEnemyDist = 60.0f;
+		if ((CTimer::GetFrameCounter() + (uint8)m_randomSeed + 16) & 4) {
 
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, waitAnim, 4.0f);
-			animAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
-			animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-			animAssoc->SetDeleteCallback(FinishedWaitCB, this);
-			break;
-		case WAITSTATE_FINISH_FLEE:
-			SetMoveState(PEDMOVE_STILL);
-			SetMoveAnim();
-			m_headingRate = 0.0f;
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 2500;
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_TIRED, 4.0f);
-#ifdef FIX_BUGS
-			animAssoc->SetFinishCallback(RestoreHeadingRateCB, this);
-#endif
-			break;
-		case WAITSTATE_SIT_DOWN:
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_SEAT_DOWN, 4.0f);
-			animAssoc->SetFinishCallback(FinishedWaitCB, this);
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 100000;
-			break;
-		case WAITSTATE_SIT_UP:
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_SEAT_UP, 4.0f);
-			animAssoc->SetFinishCallback(FinishedWaitCB, this);
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 100000;
-			break;
-		case WAITSTATE_SIT_IDLE:
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_SEAT_IDLE, 128.f);
-			animAssoc->SetFinishCallback(FinishedWaitCB, this);
-			if (time)
-				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
-			else
-				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(25000, 30000);
-			break;
-		case WAITSTATE_USE_ATM:
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_ATM, 4.0f);
-			animAssoc->SetFinishCallback(FinishedWaitCB, this);
-			if (time)
-				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
-			else
-				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 100000;
-			break;
-		case WAITSTATE_SUN_BATHE_IDLE:
-			m_headingRate = 0.0f;
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_SUNBATHE, ANIM_SUNBATHE, 4.0f);
-			animAssoc->SetDeleteCallback(DeleteSunbatheIdleAnimCB, this);
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(50000, 100000);
-			break;
-		case WAITSTATE_FAST_FALL:
-			SetFall(-1, ANIM_KO_SKID_FRONT, true);
-			break;
-		case WAITSTATE_BOMBER:
-			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_BOMBER, 4.0f);
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
-			break;
-		case WAITSTATE_GROUND_ATTACK:
-		{
-			CWeaponInfo* currentWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-			if (!currentWeapon)
-				break;
-			if (GetFireAnimGround(currentWeapon, false)) {
-				if (!RpAnimBlendClumpGetAssociation(GetClump(), GetFireAnimGround(currentWeapon, false))) {
-					m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
-					CAnimBlendAssociation* newAnim = CAnimManager::BlendAnimation(GetClump(),
-						currentWeapon->m_AnimToPlay, GetFireAnimGround(currentWeapon, false), 8.0f);
-					newAnim->SetDeleteCallback(FinishedWaitCB, this);
+			for (int i = 0; i < m_numNearPeds; ++i) {
+				if (CharCreatedBy == RANDOM_CHAR && m_nearPeds[i]->CharCreatedBy == MISSION_CHAR && !m_nearPeds[i]->IsPlayer()) {
+						continue;
 				}
-			}
-			break;
-		}
-		case WAITSTATE_LANCESITTING:
-			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_LANCE, ANIM_SUNBATHE, 4.0f);
-			break;
-		case WAITSTATE_PLAYANIM_HANDSUP_SIMPLE:
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_HANDSUP, 4.0f);
-			animAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
-			animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-			animAssoc->SetDeleteCallback(FinishedWaitCB, this);
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
-			break;
-		default:
-			ClearWaitState();
-			RestoreHeadingRate();
-			return;
-	}
-	m_nWaitState = state;
-}
-
-// --MIAMI: Done
-void
-CPed::PlayHitSound(CPed *hitTo)
-{
-	// That was very complicated to reverse for me...
-	// First index is our fight move ID (from 1 to 17, total 17), second is the one of we fight with (from 18 to 27, total 10).
-	enum {
-		S37 = SOUND_FIGHT_37,
-		S38 = SOUND_FIGHT_38,
-		S39 = SOUND_FIGHT_39,
-		S40 = SOUND_FIGHT_40,
-		S41 = SOUND_FIGHT_41,
-		S42 = SOUND_FIGHT_42,
-		S43 = SOUND_FIGHT_43,
-		S44 = SOUND_FIGHT_44,
-		S45 = SOUND_FIGHT_45,
-		S46 = SOUND_FIGHT_46,
-		S47 = SOUND_FIGHT_47,
-		S48 = SOUND_FIGHT_48,
-		NO_SND = SOUND_NO_SOUND
-	};
-	const uint16 hitSoundsByFightMoves[17][10] = {
-	  { S37, S46, S41, S41, S46, S46, S40, S41, S43, S40 },
-	  { NO_SND, NO_SND, NO_SND, NO_SND, NO_SND, NO_SND, NO_SND, NO_SND, NO_SND, NO_SND },
-	  { NO_SND, NO_SND, NO_SND, NO_SND, NO_SND, NO_SND, NO_SND, NO_SND, NO_SND, NO_SND },
-	  { S46, S46, S46, S46, S37, S47, S37, S38, S43, S38 },
-	  { S46, S46, S46, S46, S46, S46, S40, S41, S43, S46 },
-	  { S46, S46, S46, S46, S46, S46, S40, S41, S43, S40 },
-	  { S46, S46, S46, S46, S46, S46, S40, S41, S43, S40 },
-	  { S46, S46, S37, S46, S37, S47, S40, S47, S43, S37 },
-	  { S46, S46, S46, S46, S46, S46, S43, S44, S43, S43 },
-	  { S37, S46, S46, S46, S38, S47, S40, S38, S43, S46 },
-	  { S46, S37, S46, S37, S39, S46, S40, S39, S43, S37 },
-	  { S46, S37, S46, S46, S38, S47, S40, S38, S43, S46 },
-	  { S37, S37, S46, S46, S38, S47, S48, S38, S43, S37 },
-	  { S46, S46, S46, S46, S37, S46, S40, S38, S43, S46 },
-	  { S46, S46, S46, S37, S39, S46, S40, S39, S43, S46 },
-	  { S37, S46, S46, S46, S37, S46, S40, S37, S43, S46 },
-	  { S43, S43, S43, S43, S43, S43, S43, S43, S43, S43 }
-	};
-
-	eWeaponType weapon = GetWeapon()->m_eWeaponType;
-	CWeaponInfo *weaponInfo = CWeaponInfo::GetWeaponInfo(weapon);
-	if (weaponInfo->m_AnimToPlay == ASSOCGRP_KNIFE) {
-		if (m_curFightMove >= FIGHTMOVE_MELEE1) {
-			if (m_curFightMove == FIGHTMOVE_MELEE3) {
-				DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_BAT_ATTACK, (weapon << 8) | 3);
-			} else {
-				DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_KNIFE_ATTACK, (weapon << 8) | 3);
-			}
-			return;
-		}
-	}
-
-	// This is why first dimension is between FightMove 1 and 17.
-	if (m_curFightMove <= FIGHTMOVE_NULL || m_curFightMove >= FIGHTMOVE_HITFRONT)
-		return;
-
-	uint16 soundId;
-
-	// And this is why second dimension is between 18 and 27.
-	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];
-		}
-	}
-
-	if (soundId != NO_SND)
-		DMAudio.PlayOneShot(m_audioEntityId, soundId, (weapon << 8) | 3);
-}
-
-// --MIAMI: Done
-void
-CPed::CollideWithPed(CPed *collideWith)
-{
-	CAnimBlendAssociation *animAssoc;
-	AnimationId animToPlay;
-
-	bool weAreMissionChar = CharCreatedBy == MISSION_CHAR;
-	bool heIsMissionChar = collideWith->CharCreatedBy == MISSION_CHAR;
-	CVector posDiff = collideWith->GetPosition() - GetPosition();
-	int waitTime = 0;
-
-	if (weAreMissionChar || !collideWith->IsPlayer() || collideWith->m_nPedState != PED_MAKE_CALL) {
-		if (m_nWaitState == WAITSTATE_SUN_BATHE_IDLE) {
-			SetGetUp();
-			return;
-		}
-		if (collideWith->m_nWaitState == WAITSTATE_SUN_BATHE_IDLE) {
-			collideWith->SetGetUp();
-			return;
-		}
-
-		bool weDontLookToHim = DotProduct(posDiff, GetForward()) > 0.0f;
-		bool heLooksToUs = DotProduct(posDiff, collideWith->GetForward()) < 0.0f;
-
-		if (m_nMoveState != PEDMOVE_NONE && m_nMoveState != PEDMOVE_STILL) {
-
-			if ((!IsPlayer() || ((CPlayerPed*)this)->m_fMoveSpeed <= 1.8f)
-				&& (IsPlayer() || heIsMissionChar && weAreMissionChar || m_nMoveState != PEDMOVE_RUN && m_nMoveState != PEDMOVE_SPRINT
-					|| m_objective == OBJECTIVE_FOLLOW_CHAR_IN_FORMATION && m_pedInObjective == collideWith
-					|| collideWith->m_objective == OBJECTIVE_FOLLOW_CHAR_IN_FORMATION && collideWith->m_pedInObjective == this		
-					)) {
-
-				if (m_objective != OBJECTIVE_FOLLOW_CHAR_IN_FORMATION && m_objective != OBJECTIVE_GOTO_CHAR_ON_FOOT) {
-
-					if (CTimer::GetTimeInMilliseconds() > m_nPedStateTimer) {
-
-						if (heIsMissionChar || !weAreMissionChar && collideWith->m_nMoveState != PEDMOVE_STILL) {
 
-							if (weAreMissionChar && (m_nPedState == PED_SEEK_POS || m_nPedState == PED_SEEK_ENTITY)) {
+				// BUG: Explained at the same occurence of this bug above. Fixed at the bottom of the function.
+				flagsOfSomePed = CPedType::GetFlag(m_nearPeds[i]->m_nPedType);
 
-								if (collideWith->m_nMoveState != PEDMOVE_STILL
-									&& (!collideWith->IsPlayer() || collideWith->IsPlayer() && CPad::GetPad(0)->ArePlayerControlsDisabled())) {
-									float seekPosDist = (GetPosition() - m_vecSeekPos).MagnitudeSqr2D();
-									float heAndSeekPosDist = (collideWith->GetPosition() - m_vecSeekPos).MagnitudeSqr2D();
+				if (flagsOfSomePed & fearFlags) {
+					if (m_nearPeds[i]->m_fHealth > 0.0f) {
+						if (OurPedCanSeeThisOne(m_nearPeds[i], !!bIgnoreThreatsBehindObjects)) {
+							if (m_nearPeds[i]->m_nPedState == PED_ATTACK) {
+								if (m_nearPeds[i]->m_pedInObjective == this) {
 
-									if (seekPosDist <= heAndSeekPosDist) {
-										waitTime = 1000;
-										collideWith->SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, &waitTime);
-										collideWith->m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + waitTime;
-									} else {
-										waitTime = 500;
-										SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, &waitTime);
-										m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + waitTime;
+									float enemyDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
+									if (sq(closestEnemyDist) > enemyDistSqr) {
+										float enemyDist = Sqrt(enemyDistSqr);
+										weSawOurEnemy = true;
+										closestPedDist = enemyDist;
+										closestEnemyDist = enemyDist;
+										pedToFearFrom = m_nearPeds[i];
 									}
-								} else if (collideWith->m_nMoveState == PEDMOVE_STILL) {
-									SetDirectionToWalkAroundObject(collideWith);
 								}
 							} else {
-								if (FindPlayerPed() != m_pedInObjective
-									|| m_objective != OBJECTIVE_KILL_CHAR_ANY_MEANS && m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT
-									|| collideWith == m_pedInObjective) {
-
-									if (weAreMissionChar || m_pedStats->m_fear <= 100 - collideWith->m_pedStats->m_temper
-										|| (collideWith->IsPlayer() || collideWith->m_nMoveState == PEDMOVE_NONE || collideWith->m_nMoveState == PEDMOVE_STILL) &&
-										(!collideWith->IsPlayer() || ((CPlayerPed*)collideWith)->m_fMoveSpeed <= 1.0f)) {
-										SetDirectionToWalkAroundObject(collideWith);
-										if (!weAreMissionChar)
-											Say(SOUND_PED_CHAT);
-									} else {
-										SetEvasiveStep(collideWith, 2);
-									}
-								} else if (collideWith->m_nMoveState != PEDMOVE_STILL && GetWeapon()->IsTypeMelee()
-									&& collideWith->m_pedInObjective == m_pedInObjective) {
-
-									int colliderIndexAtPlayersKillList = -1;
-									int ourIndexAtPlayersKillList = -1;
-									for (int i = 0; i < ARRAY_SIZE(((CPlayerPed*)m_pedInObjective)->m_pMeleeList); i++) {
-										CPed *pedInKillList = ((CPlayerPed*)m_pedInObjective)->m_pMeleeList[i];
-										if (pedInKillList == this) {
-											ourIndexAtPlayersKillList = i;
-										} else if (pedInKillList == collideWith) {
-											colliderIndexAtPlayersKillList = i;
-										}
-									}
-									bool weAreCloserToTargetThenCollider = false;
-									if ((GetPosition() - m_vecSeekPos).MagnitudeSqr2D() < (collideWith->GetPosition() - m_vecSeekPos).MagnitudeSqr2D())
-										weAreCloserToTargetThenCollider = true;
-
-									if (ourIndexAtPlayersKillList > 0 && !weAreCloserToTargetThenCollider) {
-										if (colliderIndexAtPlayersKillList > 0) {
-											int time = 300;
-											SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, &time);
-											m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + time;
-
-										} else if (collideWith->m_pedInObjective == FindPlayerPed()) {
-											((CPlayerPed*)m_pedInObjective)->RemovePedFromMeleeList(this);
-											int time = 500;
-											SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, &time);
-											m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + time;
-										}
-									} else if (!weAreCloserToTargetThenCollider) {
-										int time = 300;
-										SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, &time);
-										m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + time;
-									} 
-								} else {
-									SetDirectionToWalkAroundObject(collideWith);
+								float nearPedDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
+								if (sq(closestPedDist) > nearPedDistSqr && !weSawOurEnemy) {
+									closestPedDist = Sqrt(nearPedDistSqr);
+									pedToFearFrom = m_nearPeds[i];
 								}
 							}
-						} else {
-							if (m_pedStats->m_temper <= m_pedStats->m_fear
-								|| GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED
-								|| weAreMissionChar
-								|| collideWith->m_nPedType == PEDTYPE_CIVFEMALE
-								|| collideWith->m_nPedType == m_nPedType
-								|| collideWith->GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED) {
-								SetDirectionToWalkAroundObject(collideWith);
-								Say(SOUND_PED_CHAT);
-							} else {
-								TurnBody();
-								SetAttack(collideWith);
-								m_fRotationCur = 0.3f + m_fRotationCur;
-								m_fRotationDest = m_fRotationCur;
-							}
-							m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(250, 450);
-						}
-					}
-				} else {
-					if (m_pedInObjective && (collideWith == m_pedInObjective || collideWith->m_pedInObjective == m_pedInObjective) && CTimer::GetTimeInMilliseconds() > m_nPedStateTimer) {
-						if (heLooksToUs) {
-							SetEvasiveStep(collideWith, 1);
-							m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 3000;
-						}
-					} else if (weDontLookToHim && IsPedInControl()) {
-
-						if (m_pedStats != collideWith->m_pedStats) {
+						} else if (!weSawOurEnemy) {
+							CPed *nearPed = m_nearPeds[i];
+							if (nearPed->m_nPedState == PED_ATTACK) {
+								CColPoint foundCol;
+								CEntity *foundEnt;
 
-							if (collideWith->m_pedStats->m_fear <= 100 - m_pedStats->m_temper || collideWith->IsPlayer()
-								|| CTimer::GetTimeInMilliseconds() < m_nPedStateTimer) {
+								// We don't see him yet but he's behind a ped, vehicle or object
+								if (!CWorld::ProcessLineOfSight(ourPos, nearPed->GetPosition(), foundCol, foundEnt,
+									true, false, false, !!bIgnoreThreatsBehindObjects, false, false, false)) {
 
-								if (collideWith->IsPlayer()) {
-									// He's on our right side
-									if (DotProduct(posDiff,GetRight()) <= 0.0f)
-										m_fRotationCur -= m_headingRate;
-									else
-										m_fRotationCur += m_headingRate;
-								} else {
-									// He's on our right side
-									if (DotProduct(posDiff, collideWith->GetRight()) <= 0.0f)
-										collideWith->m_fRotationCur -= collideWith->m_headingRate;
-									else
-										collideWith->m_fRotationCur += collideWith->m_headingRate;
-								}
-							} else {
-								SetLookFlag(collideWith, false);
-								TurnBody();
-								animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT_PPUNCH, 8.0f);
-								animAssoc->flags |= ASSOC_FADEOUTWHENDONE;
-								m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 2000;
-								if (!heIsMissionChar) {
-									CVector2D posDiff2D(posDiff);
-									int direction = collideWith->GetLocalDirection(posDiff2D);
-									collideWith->StartFightDefend(direction, HITLEVEL_HIGH, 5);
+									if (nearPed->m_pedInObjective == this) {
+										float enemyDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
+										if (sq(closestEnemyDist) > enemyDistSqr) {
+											float enemyDist = Sqrt(enemyDistSqr);
+											weMaySeeOurEnemy = true;
+											closestPedDist = enemyDist;
+											closestEnemyDist = enemyDist;
+											pedToFearFrom = m_nearPeds[i];
+										}
+									} else if (!nearPed->GetWeapon()->IsTypeMelee() && !weMaySeeOurEnemy) {
+										float nearPedDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
+										if (sq(closestPedDist) > nearPedDistSqr) {
+											weMaySeeOurEnemy = true;
+											closestPedDist = Sqrt(nearPedDistSqr);
+											pedToFearFrom = m_nearPeds[i];
+										}
+									}
 								}
 							}
 						}
 					}
 				}
-			} else if (collideWith->m_pedStats->m_defendWeakness <= 1.5f || heIsMissionChar ||
-				m_pedStats->m_defendWeakness <= collideWith->m_pedStats->m_defendWeakness) {
-
-				// He looks us and we're not at his right side
-				if (heLooksToUs && DotProduct(posDiff,collideWith->GetRight()) > 0.0f) {
-					CVector moveForce = GetRight();
-					moveForce.z += 0.1f;
-					ApplyMoveForce(moveForce);
-					if (collideWith->m_nMoveState != PEDMOVE_RUN && collideWith->m_nMoveState != PEDMOVE_SPRINT)
-						animToPlay = ANIM_HIT_LEFT;
-					else
-						animToPlay = ANIM_SHOT_LEFT_PARTIAL;
-				} else if (heLooksToUs) {
-					CVector moveForce = GetRight() * -1.0f;
-					moveForce.z += 0.1f;
-					ApplyMoveForce(moveForce);
-					if (collideWith->m_nMoveState != PEDMOVE_RUN && collideWith->m_nMoveState != PEDMOVE_SPRINT)
-						animToPlay = ANIM_HIT_RIGHT;
-					else
-						animToPlay = ANIM_SHOT_RIGHT_PARTIAL;
-				} else {
-					if (collideWith->m_nMoveState != PEDMOVE_RUN && collideWith->m_nMoveState != PEDMOVE_SPRINT)
-						animToPlay = ANIM_HIT_BACK;
-					else
-						animToPlay = ANIM_SHOT_BACK_PARTIAL;
-				}
-
-				if (collideWith->IsPedInControl() && CTimer::GetTimeInMilliseconds() > collideWith->m_nPedStateTimer) {
-					animAssoc = CAnimManager::BlendAnimation(collideWith->GetClump(), ASSOCGRP_STD, animToPlay, 8.0f);
-					animAssoc->flags |= ASSOC_FADEOUTWHENDONE;
-					collideWith->m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 1000;
-					if (m_nPedState == PED_ATTACK)
-						DMAudio.PlayOneShot(m_audioEntityId, SOUND_FIGHT_46, 0.0f);
-				}
-			} else {
-				// We're at his right side
-				if (DotProduct(posDiff, collideWith->GetRight()) <= 0.0f) {
-					CVector moveForce = GetRight() * -1.0f;
-					moveForce.z += 0.1f;
-					ApplyMoveForce(moveForce);
-					if (heLooksToUs)
-						animToPlay = ANIM_KO_SPIN_L;
-					else
-						animToPlay = ANIM_KD_RIGHT;
-				} else {
-					CVector moveForce = GetRight();
-					moveForce.z += 0.1f;
-					ApplyMoveForce(moveForce);
-					if (heLooksToUs)
-						animToPlay = ANIM_KO_SPIN_R;
-					else
-						animToPlay = ANIM_KD_LEFT;
-				}
-
-				if (m_nPedState == PED_ATTACK && collideWith->IsPedInControl())
-					DMAudio.PlayOneShot(m_audioEntityId, SOUND_49, 0.0f);
-
-				collideWith->SetFall(3000, animToPlay, 0);
-			}
-		} else {
-			if (!IsPedInControl())
-				return;
-
-			if (collideWith->m_nMoveState == PEDMOVE_NONE || collideWith->m_nMoveState == PEDMOVE_STILL)
-				return;
-
-			if (m_nPedType != collideWith->m_nPedType || m_nPedType == PEDTYPE_CIVMALE || m_nPedType == PEDTYPE_CIVFEMALE) {
-
-				if (!weAreMissionChar && heLooksToUs && m_pedStats->m_fear > 100 - collideWith->m_pedStats->m_temper) {
-
-					if (CGeneral::GetRandomNumber() & 1 && CTimer::GetTimeInMilliseconds() < m_nPedStateTimer){
-						SetEvasiveStep(collideWith, 2);
-						m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 3000;
-					} else if (collideWith->m_nMoveState > PEDMOVE_WALK) {
-						waitTime = 2000;
-						SetWaitState(WAITSTATE_PLAYANIM_DUCK, &waitTime);
-					}
-				}
-			} else if (heLooksToUs
-				&& collideWith->m_nPedState != PED_STEP_AWAY
-				&& m_nPedState != PED_STEP_AWAY
-				&& CTimer::GetTimeInMilliseconds() > m_nPedStateTimer) {
-
-				SetEvasiveStep(collideWith, 1);
-				m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 3000;
 			}
 		}
 
-		if (IsPlayer()) {
-			SetLookFlag(collideWith, true);
-			SetLookTimer(800);
-		}
-	} else {
-		bool isRunning = m_nMoveState == PEDMOVE_RUN || m_nMoveState == PEDMOVE_SPRINT;
-		SetFindPathAndFlee(collideWith, 5000, !isRunning);
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::CreateDeadPedMoney(void)
-{
-	if (!CGame::nastyGame)
-		return;
-
-	int mi = GetModelIndex();
-
-	if ((mi >= MI_COP && mi <= MI_FIREMAN) || (CharCreatedBy == MISSION_CHAR && !bMoneyHasBeenGivenByScript) || bInVehicle)
-		return;
-
-	int money = m_nPedMoney;
-	if (money < 10)
-		return;
-
-	CVector pickupPos = GetPosition();
-	CPickups::CreateSomeMoney(pickupPos, money);
-	m_nPedMoney = 0;
-}
-
-// --MIAMI: Done
-void
-CPed::CreateDeadPedPickupCoors(float *x, float *y, float *z)
-{
-	bool found = false;
-	CVector pickupPos;
-
-#define NUMBER_OF_ATTEMPTS 32
-	for (int i = 0; i < NUMBER_OF_ATTEMPTS; i++) {
-
-		pickupPos = GetPosition();
-		pickupPos.x = 1.5f * Sin((CGeneral::GetRandomNumber() % 256)/256.0f * TWOPI) + GetPosition().x;
-		pickupPos.y = 1.5f * Cos((CGeneral::GetRandomNumber() % 256)/256.0f * TWOPI) + GetPosition().y;
-		pickupPos.z = CWorld::FindGroundZFor3DCoord(pickupPos.x, pickupPos.y, pickupPos.z, &found) + 0.5f;
-
-		if (!found)
-			continue;
-
-		CVector pedPos = GetPosition();
-		pedPos.z += 0.3f;
-
-		CVector pedToPickup = pickupPos - pedPos;
-		float distance = pedToPickup.Magnitude();
-
-		// outer edge of pickup
-		distance = (distance + 0.4f) / distance;
-		CVector pickupPos2 = pedPos;
-		pickupPos2 += distance * pedToPickup;
-
-		if ((pickupPos - FindPlayerCoors()).Magnitude2D() > 2.0f || i > NUMBER_OF_ATTEMPTS / 2) {
+		int16 lastVehicle;
+		CEntity* vehicles[8];
+		CWorld::FindObjectsInRange(ourPos, 20.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
+		CVehicle* foundVeh = nil;
+		for (int i = 0; i < lastVehicle; i++) {
+			CVehicle* nearVeh = (CVehicle*)vehicles[i];
 
-			if (i > NUMBER_OF_ATTEMPTS / 2 || !CPickups::TestForPickupsInBubble(pickupPos, 1.3f)) {
+			CPed *driver = nearVeh->pDriver;
+			if (driver) {
 
-				if (CWorld::GetIsLineOfSightClear(pickupPos2, pedPos,
-					true, i < NUMBER_OF_ATTEMPTS / 2, false, i < NUMBER_OF_ATTEMPTS / 2, false, false, false)) {
+				// BUG: Same bug as above. Fixed at the bottom of function.
+				flagsOfSomePed = CPedType::GetFlag(driver->m_nPedType);
+				if (CPedType::GetFlag(driver->m_nPedType) & fearFlags) {
 
-					if (i > NUMBER_OF_ATTEMPTS / 2 || !CWorld::TestSphereAgainstWorld(pickupPos, 1.2f, nil, false, true, false, false, false, false)) {
-						*x = pickupPos.x;
-						*y = pickupPos.y;
-						*z = pickupPos.z;
-						return;
+					if (driver->m_fHealth > 0.0f && OurPedCanSeeThisOne(nearVeh->pDriver)) {
+						// FIX: Taken from VC
+#ifdef FIX_BUGS
+						float driverDistSqr = (driver->GetPosition() - ourPos).MagnitudeSqr2D();
+#else
+						float driverDistSqr = (CVector2D(ourPos) - explosionPos).MagnitudeSqr();
+#endif
+						if (sq(closestPedDist) > driverDistSqr) {
+							closestPedDist = Sqrt(driverDistSqr);
+							pedToFearFrom = nearVeh->pDriver;
+						}
 					}
 				}
 			}
 		}
-	}
-	*x = GetPosition().x;
-	*y = GetPosition().y;
-	*z = GetPosition().z + 0.4f;
-#undef NUMBER_OF_ATTEMPTS
-}
-
-// --MIAMI: Done
-void
-CPed::CreateDeadPedWeaponPickups(void)
-{
-	CVector pickupPos;
-
-	if (bInVehicle)
-		return;
-
-	for(int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
+		m_threatEntity = pedToFearFrom;
+		if (m_threatEntity)
+			m_threatEntity->RegisterReference((CEntity **) &m_threatEntity);
 
-		eWeaponType weapon = GetWeapon(i).m_eWeaponType;
-		int weaponAmmo = GetWeapon(i).m_nAmmoTotal;
-		if (weapon == WEAPONTYPE_UNARMED || weapon == WEAPONTYPE_DETONATOR || (weaponAmmo == 0 && !GetWeapon(i).IsTypeMelee()))
-			continue;
+#ifdef FIX_BUGS
+		if (pedToFearFrom)
+			flagsOfSomePed = CPedType::GetFlag(((CPed*)m_threatEntity)->m_nPedType);
+		else
+			flagsOfSomePed = 0;
+#endif
 
-		int quantity = Min(weaponAmmo, AmmoForWeapon_OnStreet[weapon] / 2);
-		CreateDeadPedPickupCoors(&pickupPos.x, &pickupPos.y, &pickupPos.z);
-		pickupPos.z += 0.3f;
-		if (!CPickups::TryToMerge_WeaponType(pickupPos, weapon, PICKUP_ONCE_TIMEOUT, quantity, false)) {
-			CPickups::GenerateNewOne_WeaponType(pickupPos, weapon, PICKUP_ONCE_TIMEOUT, Min(weaponAmmo, quantity));
-		}
+		return flagsOfSomePed;
 	}
-	ClearWeapons();
-}
-
-// --MIAMI: Done
-void
-CPed::SetAttackTimer(uint32 time)
-{
-	if (CTimer::GetTimeInMilliseconds() > m_attackTimer)
-		m_attackTimer = Max(m_shootTimer, CTimer::GetTimeInMilliseconds()) + time;
 }
 
 // --MIAMI: Done
 void
-CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack)
+CPed::ScanForDelayedResponseThreats(void)
 {
-	if (m_nPedState == PED_DRAG_FROM_CAR)
+	if (m_threatFlags)
 		return;
 
-	bUsesCollision = false;
-	m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-	m_nLastPedState = PED_IDLE;
-	SetMoveState(PEDMOVE_STILL);
-	m_pSeekTarget = veh;
-	m_pSeekTarget->RegisterReference((CEntity **) &m_pSeekTarget);
-
-	if (veh->IsBike()) {
-		((CBike*)veh)->bIsBeingPickedUp = true;
-		if (veh->pPassengers[0] != this && (vehEnterType != CAR_WINDSCREEN || veh->pPassengers[0]))
-			m_vehEnterType = CAR_DOOR_LF;
-		else
-			m_vehEnterType = CAR_DOOR_LR;
-	} else {
-		m_vehEnterType = vehEnterType;
-	}
-
-	if (m_vehEnterType == CAR_DOOR_LF) {
-		if (veh->pDriver && veh->pDriver->IsPlayer())
-			veh->SetStatus(STATUS_PLAYER_DISABLED);
-		else
-			veh->SetStatus(STATUS_ABANDONED);
-	}
-	RemoveInCarAnims();
-	SetMoveState(PEDMOVE_NONE);
-	LineUpPedWithCar(veh->IsBike() ? LINE_UP_TO_CAR_FALL : LINE_UP_TO_CAR_START);
-	m_pVehicleAnim = nil;
-	SetPedState(PED_DRAG_FROM_CAR);
-	bChangedSeat = false;
-	bWillBeQuickJacked = quickJack;
-
-	SetHeading(m_fRotationCur);
-
-	Say(SOUND_PED_CAR_JACKED);
-	SetRadioStation();
-
-	if(veh->IsBike())
-		veh->m_nGettingOutFlags |= GetBikeDoorFlagInclJumpInFromFront(m_vehEnterType);
-	else
-		veh->m_nGettingOutFlags |= GetCarDoorFlag(m_vehEnterType);
-}
-
-// --MIAMI: Done
-void
-CPed::BuyIceCream(void)
-{
-	if (m_carInObjective) {
-		CPed *driver = m_carInObjective->pDriver;
-		if (driver && CTimer::GetTimeInMilliseconds() > m_standardTimer) {
-			SetChat(driver, 8000);
-			driver->SetChat(this, 8000);
+	m_threatEntity = nil;
+	m_pEventEntity = nil;
+	m_threatFlags = ScanForThreats();
+	if (m_threatFlags) {
+		if (m_threatEntity || m_pEventEntity) {
+			m_threatCheckTimer = CTimer::GetTimeInMilliseconds() + m_threatCheckInterval;
 			return;
 		}
-		SetObjective(OBJECTIVE_NONE);
-		SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
-	} else {
-		SetObjective(OBJECTIVE_NONE);
-		SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetBuyIceCream(void)
-{
-	if (m_nPedState == PED_BUY_ICECREAM || !IsPedInControl())
-		return;
-
-	if (!m_carInObjective)
-		return;
-
-	SetPedState(PED_BUY_ICECREAM);
-}
-
-// --MIAMI: Done
-void
-CPed::SetChat(CEntity *chatWith, uint32 time)
-{
-	if (m_nPedState != PED_CHAT) {
-		m_nLastPedState = PED_NONE;
-		SetStoredState();
-	}
-
-	SetPedState(PED_CHAT);
-	SetMoveState(PEDMOVE_STILL);
-	m_lookTimer = 0;
-	SetLookFlag(chatWith, true);
-	m_standardTimer = CTimer::GetTimeInMilliseconds() + time;
-	m_lookTimer = CTimer::GetTimeInMilliseconds() + 3000;
-}
-
-// --MIAMI: Done
-void
-CPed::RemoveWeaponAnims(int unused, float animDelta)
-{	
-	CAnimBlendAssociation *weaponAssoc;
-	//CWeaponInfo::GetWeaponInfo(unused);
-
-	weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE);
-	if (weaponAssoc) {
-		weaponAssoc->blendDelta = animDelta;
-		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
-	}
-	weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE_2ND);
-	if (weaponAssoc) {
-		weaponAssoc->blendDelta = animDelta;
-		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
-	}
-	weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE_3RD);
-	if (weaponAssoc) {
-		weaponAssoc->blendDelta = animDelta;
-		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
-	}
-	weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_RELOAD);
-	if (weaponAssoc) {
-		weaponAssoc->blendDelta = animDelta;
-		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
-	}
-	weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCHRELOAD);
-	if (weaponAssoc) {
-		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
-		if (weaponAssoc->flags & ASSOC_PARTIAL)
-			weaponAssoc->blendDelta = animDelta;
-		else
-			CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, -animDelta);
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetDead(void)
-{
-	if (!RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DROWN))
-		bUsesCollision = false;
-
-	m_fHealth = 0.0f;
-	if (m_nPedState == PED_DRIVING)
-		bIsVisible = false;
-
-	SetPedState(PED_DEAD);
-	m_pVehicleAnim = nil;
-	m_pCollidingEntity = nil;
-
-	CWeaponInfo *weapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	RemoveWeaponModel(weapon->m_nModelId);
-
-	m_currentWeapon = WEAPONTYPE_UNARMED;
-	CEventList::RegisterEvent(EVENT_INJURED_PED, EVENT_ENTITY_PED, this, nil, 250);
-	if (this != FindPlayerPed()) {
-		RemoveWeaponAnims(0, -1000.0f);
-		CreateDeadPedWeaponPickups();
-		CreateDeadPedMoney();
+		m_threatFlags = 0;
 	}
-
-	m_bloodyFootprintCountOrDeathTime = CTimer::GetTimeInMilliseconds();
-	m_deadBleeding = false;
-	bDoBloodyFootprints = false;
-	bVehExitWillBeInstant = false;
-	CEventList::RegisterEvent(EVENT_DEAD_PED, EVENT_ENTITY_PED, this, nil, 1000);
-}
-
-// --MIAMI: Done
-void
-CPed::SetSeek(CEntity *seeking, float distanceToCountDone)
-{
-	if (!IsPedInControl())
-		return;
-
-	if (m_nPedState == PED_SEEK_ENTITY && m_pSeekTarget == seeking)
-		return;
-
-	if (!seeking || m_nPedState == PED_FOLLOW_PATH)
-		return;
-
-	if (m_nPedState != PED_SEEK_ENTITY)
-		SetStoredState();
-
-	SetPedState(PED_SEEK_ENTITY);
-	m_distanceToCountSeekDone = distanceToCountDone;
-	m_pSeekTarget = seeking;
-	m_pSeekTarget->RegisterReference((CEntity **) &m_pSeekTarget);
-	SetMoveState(PEDMOVE_STILL);
+	m_threatCheckTimer = 0;
 }
 
 // --MIAMI: Done
 void
-CPed::SetSeek(CVector pos, float distanceToCountDone)
+CPed::CheckThreatValidity(void)
 {
-	if (!IsPedInControl()
-		|| (m_nPedState == PED_SEEK_POS && m_vecSeekPos.x == pos.x && m_vecSeekPos.y == pos.y) || m_nPedState == PED_FOLLOW_PATH)
-		return;
-
-	if (!CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_bCanAimWithArm) {
-		ClearPointGunAt();
+	if (m_threatEntity && !IsEntityPointerValid(m_threatEntity)) {
+		m_threatFlags = 0;
+		m_threatEntity = nil;
 	}
-
-	if (m_nPedState != PED_SEEK_POS)
-		SetStoredState();
-
-	SetPedState(PED_SEEK_POS);
-	m_distanceToCountSeekDone = distanceToCountDone;
-	m_vecSeekPos = pos;
-}
-
-// --MIAMI: Done
-void
-CPed::DeadPedMakesTyresBloody(void)
-{
-	int minX = CWorld::GetSectorIndexX(GetPosition().x - 2.0f);
-	if (minX < 0) minX = 0;
-	int minY = CWorld::GetSectorIndexY(GetPosition().y - 2.0f);
-	if (minY < 0) minY = 0;
-	int maxX = CWorld::GetSectorIndexX(GetPosition().x + 2.0f);
-	if (maxX > NUMSECTORS_X-1) maxX = NUMSECTORS_X-1;
-	int maxY = CWorld::GetSectorIndexY(GetPosition().y + 2.0f);
-	if (maxY > NUMSECTORS_Y-1) maxY = NUMSECTORS_Y-1;
-
-	CWorld::AdvanceCurrentScanCode();
-
-	for (int curY = minY; curY <= maxY; curY++) {
-		for (int curX = minX; curX <= maxX; curX++) {
-			CSector *sector = CWorld::GetSector(curX, curY);
-			MakeTyresMuddySectorList(sector->m_lists[ENTITYLIST_VEHICLES]);
-			MakeTyresMuddySectorList(sector->m_lists[ENTITYLIST_VEHICLES_OVERLAP]);
-		}
+	if (m_pEventEntity && !IsEntityPointerValid(m_pEventEntity)) {
+		m_threatFlags = 0;
+		m_pEventEntity = nil;
 	}
-}
-
-// --MIAMI: Done
-void
-CPed::Die(void)
-{
-	// UNUSED: This is a perfectly empty function.
+	if (!m_threatEntity && !m_pEventEntity)
+		m_threatFlags = 0;
 }
 
 // --MIAMI: Done
 bool
-CPed::DuckAndCover(void)
+CPed::CanUseTorsoWhenLooking(void)
 {
-	if (!m_pedInObjective || CTimer::GetTimeInMilliseconds() <= m_duckAndCoverTimer)
-		return false;
-
-	if (bKindaStayInSamePlace){
-
-		if (CTimer::GetTimeInMilliseconds() <= m_leaveCarTimer) {
-			if (!m_pLookTarget || m_pLookTarget != m_pedInObjective) {
-				m_pLookTarget = m_pedInObjective;
-				m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
-			}
-			if (!bIsAimingGun)
-				SetAimFlag(m_pedInObjective);
-
-		} else {
-			bKindaStayInSamePlace = false;
-			if (bIsDucking)
-				ClearDuck(true);
-
-			bCrouchWhenShooting = false;
-			bDuckAndCover = false;
-			m_headingRate = 10.0f;
-			m_duckAndCoverTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(20000,30000);
-			if (m_pSeekTarget && m_pSeekTarget->IsVehicle())
-				((CVehicle*)m_pSeekTarget)->m_numPedsUseItAsCover--;
-		}
-		return false;
-	}
-	
-	int16 lastVehicle = 0;
-	CEntity* vehicles[8];
-
-	bool justDucked = false;
-	CVehicle *foundVeh = nil;
-	float maxDist = 225.0f;
-	if (bIsDucking)
-		ClearDuck(true);
-
-	bCrouchWhenShooting = false;
-	bool duckingWithoutVeh = false;
-	if (CTimer::GetTimeInMilliseconds() > m_leaveCarTimer) {
-
-		for(int i = 0; i < 6; i++) {
-			CPlayerPed *player = (CPlayerPed*)m_pedInObjective;
-
-			if (player->m_pPedAtSafePos[i] == this) {
-				duckingWithoutVeh = true;
-				CVector &safePos = player->m_vecSafePos[i];
-				bool notRunningToSafePos = false;
-
-				if (m_vecSeekPos.x != safePos.x && m_vecSeekPos.y != safePos.y && m_vecSeekPos.z != safePos.z)
-					notRunningToSafePos = true;
-
-				if (!notRunningToSafePos) {
-					CVector target = player->m_vecSafePos[i];
-					SetSeek(target, 1.0f);
-					duckingWithoutVeh = true;
-					m_attackTimer = CTimer::GetTimeInMilliseconds() + 6000;
-					bDuckAndCover = true;
-				}
-				break;
-			}
-		}
-		if (!duckingWithoutVeh) {
-			for (int i = 0; i < 6; i++) {
-				CPlayerPed* player = (CPlayerPed*)m_pedInObjective;
-				if (!player->m_pPedAtSafePos[i] && player->m_vecSafePos[i].x != 0.0f) {
-					player->m_pPedAtSafePos[i] = this;
-					CVector target = player->m_vecSafePos[i];
-					SetSeek(target, 1.0f);
-					m_headingRate = 15.0f;
-					ClearPointGunAt();
-					duckingWithoutVeh = 1;
-					bIsRunning = true;
-					bDuckAndCover = true;
-					justDucked = true;
-					m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 500;
-					break;
-				}
-			}
-		}
-		if (!duckingWithoutVeh) {
-			CVector pos = GetPosition();
-			CWorld::FindObjectsInRange(pos, CHECK_NEARBY_THINGS_MAX_DIST, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
-		}
-
-		for (int i = 0; i < lastVehicle; i++) {
-			CVehicle *veh = (CVehicle*) vehicles[i];
-			if (veh->IsCar() && veh->m_vecMoveSpeed.Magnitude() <= 0.02f
-				&& !veh->bIsBus && !veh->bIsVan && !veh->bIsBig
-				&& veh->m_numPedsUseItAsCover < 3) {
-
-				float dist = (GetPosition() - veh->GetPosition()).MagnitudeSqr();
-				if (dist < maxDist) {
-					maxDist = dist;
-					foundVeh = veh;
-				}
-			}
-		}
-		if (foundVeh) {
-			// Unused.
-			// CVector lfWheelPos, rfWheelPos;
-			// foundVeh->GetComponentWorldPosition(CAR_WHEEL_RF, rfWheelPos);
-			// foundVeh->GetComponentWorldPosition(CAR_WHEEL_LF, lfWheelPos);
-			CVector rightSide, leftSide;
-
-			// 3 persons can use the car as cover. Found the correct position for us.
-			if (foundVeh->m_numPedsUseItAsCover == 2) {
-				rightSide = CVector(1.5f, -0.5f, 0.0f);
-				leftSide = CVector(-1.5f, -0.5f, 0.0f);
-			} else if (foundVeh->m_numPedsUseItAsCover == 1) {
-				rightSide = CVector(1.5f, 0.5f, 0.0f);
-				leftSide = CVector(-1.5f, 0.5f, 0.0f);
-			} else if (foundVeh->m_numPedsUseItAsCover == 0) {
-				rightSide = CVector(1.5f, 0.0f, 0.0f);
-				leftSide = CVector(-1.5f, 0.0f, 0.0f);
-			}
-
-			CMatrix vehMatrix(foundVeh->GetMatrix());
-			CVector duckAtRightSide = Multiply3x3(vehMatrix, rightSide) + foundVeh->GetPosition();
-
-			CVector duckAtLeftSide = Multiply3x3(vehMatrix, leftSide) + foundVeh->GetPosition();
-
-			CVector distWithPedRightSide = m_pedInObjective->GetPosition() - duckAtRightSide;
-			CVector distWithPedLeftSide = m_pedInObjective->GetPosition() - duckAtLeftSide;
-
-			CVector duckPos;
-			if (distWithPedRightSide.MagnitudeSqr() <= distWithPedLeftSide.MagnitudeSqr())
-				duckPos = duckAtLeftSide;
-			else
-				duckPos = duckAtRightSide;
-
-			if (CWorld::TestSphereAgainstWorld(duckPos, 0.5f, nil, true, true, true, false, false, false)) {
-				SetSeek(duckPos, 1.0f);
-				m_headingRate = 15.0f;
-				bIsRunning = true;
-				bDuckAndCover = true;
-				justDucked = true;
-				m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 500;
-				if (foundVeh->bIsLawEnforcer) {
-					m_carInObjective = foundVeh;
-					m_carInObjective->RegisterReference((CEntity**)&m_carInObjective);
-				}
-				m_pSeekTarget = foundVeh;
-				m_pSeekTarget->RegisterReference((CEntity**)&m_pSeekTarget);
-				ClearPointGunAt();
-			} else {
-				m_duckAndCoverTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(10000, 15000);
-				bDuckAndCover = false;
-			}
-		} else if (!duckingWithoutVeh) {
-			bDuckAndCover = false;
-		}
-	}
-
-	if (!justDucked && !bDuckAndCover)
-		return false;
-	
-	if (!Seek()) {
-		if (m_nMoveState == PEDMOVE_STILL) {
-			bDuckAndCover = false;
-			return false;
-		} else
+	if (m_nPedState != PED_DRIVING && m_nPedState != PED_DRAG_FROM_CAR && !bIsDucking) {
+		if (m_animGroup != ASSOCGRP_SEXYWOMAN && m_animGroup != ASSOCGRP_WOMAN)
 			return true;
 	}
-
-	bKindaStayInSamePlace = true;
-	bDuckAndCover = false;
-	m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
-	if (m_pSeekTarget && m_pSeekTarget->IsVehicle())
-		((CVehicle*)m_pSeekTarget)->m_numPedsUseItAsCover++;
-	
-	SetIdle();
-	SetMoveState(PEDMOVE_STILL);
-	SetMoveAnim();
-	if (!m_pLookTarget || m_pLookTarget != m_pedInObjective) {
-		m_pLookTarget = m_pedInObjective;
-		m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
-	}
-
-	m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(3000, 6000);
-	bCrouchWhenShooting = true;
-	SetDuck(CGeneral::GetRandomNumberInRange(2000, 5000), true);
 	return false;
 }
 
 // --MIAMI: Done
 void
-CPed::EndFight(uint8 endType)
-{
-	if (m_nPedState != PED_FIGHT)
-		return;
-
-	m_curFightMove = FIGHTMOVE_NULL;
-	RestorePreviousState();
-	CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FIGHT_IDLE);
-	if (!animAssoc)
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCHRELOAD);
-
-	if (animAssoc)
-		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-
-	switch (endType) {
-		case ENDFIGHT_NORMAL:
-			CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 8.0f);
-			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT2_IDLE, 8.0f);
-			break;
-		case ENDFIGHT_WITH_A_STEP:
-			CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 1.0f);
-			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_WALK_START, 8.0f);
-			break;
-		case ENDFIGHT_FAST:
-			CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 8.0f);
-			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT2_IDLE, 8.0f)->speed = 2.0f;
-			break;
-		default:
-			break;
-	}
-	m_nWaitTimer = 0;
-}
-
-// --MIAMI: Done
-void
-CPed::EnterCar(void)
-{
-	if (IsNotInWreckedVehicle() && m_fHealth > 0.0f) {
-		CVehicle *veh = m_pMyVehicle;
-
-		// Not used.
-		// CVector posForDoor = GetPositionToOpenCarDoor(veh, m_vehEnterType);
-
-		if (veh->CanPedOpenLocks(this)) {
-			if (m_vehEnterType && m_pVehicleAnim) {
-				veh->ProcessOpenDoor(m_vehEnterType, m_pVehicleAnim->animId, m_pVehicleAnim->currentTime);
-			}
-		}
-		bIsInTheAir = false;
-		LineUpPedWithCar(LINE_UP_TO_CAR_START);
-		if (veh->IsBike()) {
-			CBike *bike = (CBike*)veh;
-			if (bike->GetStatus() == STATUS_ABANDONED && !bike->bIsBeingPickedUp && m_pVehicleAnim) {
-				int anim = m_pVehicleAnim->animId;
-
-				// One is pickup and other one is pullup, not same :p
-				if ((anim == ANIM_BIKE_PICKUP_R || anim == ANIM_BIKE_PICKUP_L) && m_pVehicleAnim->currentTime > 0.4667f)
-					bike->bIsBeingPickedUp = true;
-				else if ((anim == ANIM_BIKE_PULLUP_R || anim == ANIM_BIKE_PULLUP_L) && m_pVehicleAnim->currentTime > 0.4667f)
-					bike->bIsBeingPickedUp = true;
-			} else if (m_nPedState == PED_CARJACK && m_pVehicleAnim) {
-				if (m_pVehicleAnim->currentTime > 0.4f && m_pVehicleAnim->currentTime - m_pVehicleAnim->timeStep <= 0.4f) {
-					int anim = m_pVehicleAnim->animId;
-					if (anim == ANIM_BIKE_KICK) {
-						DMAudio.PlayOneShot(m_audioEntityId, SOUND_187, 3.0f);
-					} else if (anim == ANIM_BIKE_ELBOW_R || anim == ANIM_BIKE_ELBOW_L) {
-						DMAudio.PlayOneShot(m_audioEntityId, SOUND_186, 3.0f);
-					}
-				}
-			}
-		}
-	} else {
-		QuitEnteringCar();
-		SetDie();
-	}
-}
-
-// --MIAMI: Done
-uint8
-CPed::GetNearestTrainPedPosition(CVehicle *train, CVector &enterPos)
+CPed::SetLookFlag(float direction, bool keepTryingToLook, bool cancelPrevious)
 {
-	CVector enterStepOffset;
-	CVehicleModelInfo *trainModel = (CVehicleModelInfo *)CModelInfo::GetModelInfo(train->GetModelIndex());
-	CMatrix trainMat = CMatrix(train->GetMatrix());
-	CVector leftEntryPos, rightEntryPos, midEntryPos;
-	float distLeftEntry, distRightEntry, distMidEntry;
-
-	// enterStepOffset = vecPedCarDoorAnimOffset;
-	enterStepOffset = CVector(1.5f, 0.0f, 0.0f);
-
-	if (train->pPassengers[TRAIN_POS_LEFT_ENTRY]) {
-		distLeftEntry = 999.0f;
-	} else {
-		leftEntryPos = trainModel->m_positions[TRAIN_POS_LEFT_ENTRY] - enterStepOffset;
-		leftEntryPos = Multiply3x3(trainMat, leftEntryPos);
-		leftEntryPos += train->GetPosition();
-		distLeftEntry = (leftEntryPos - GetPosition()).Magnitude();
-	}
-
-	if (train->pPassengers[TRAIN_POS_MID_ENTRY]) {
-		distMidEntry = 999.0f;
-	} else {
-		midEntryPos = trainModel->m_positions[TRAIN_POS_MID_ENTRY] - enterStepOffset;
-		midEntryPos = Multiply3x3(trainMat, midEntryPos);
-		midEntryPos += train->GetPosition();
-		distMidEntry = (midEntryPos - GetPosition()).Magnitude();
-	}
-
-	if (train->pPassengers[TRAIN_POS_RIGHT_ENTRY]) {
-		distRightEntry = 999.0f;
-	} else {
-		rightEntryPos = trainModel->m_positions[TRAIN_POS_RIGHT_ENTRY] - enterStepOffset;
-		rightEntryPos = Multiply3x3(trainMat, rightEntryPos);
-		rightEntryPos += train->GetPosition();
-		distRightEntry = (rightEntryPos - GetPosition()).Magnitude();
-	}
-
-	if (distMidEntry < distLeftEntry) {
-		if (distMidEntry < distRightEntry) {
-			enterPos = midEntryPos;
-			m_vehEnterType = TRAIN_POS_MID_ENTRY;
-		} else {
-			enterPos = rightEntryPos;
-			m_vehEnterType = TRAIN_POS_RIGHT_ENTRY;
+	if (m_lookTimer < CTimer::GetTimeInMilliseconds() || cancelPrevious) {
+		bIsLooking = true;
+		bIsRestoringLook = false;
+		m_fLookDirection = direction;
+		m_pLookTarget = nil;
+		m_lookTimer = 0;
+		bKeepTryingToLook = keepTryingToLook;
+		if (CanUseTorsoWhenLooking()) {
+			m_pedIK.m_flags &= ~CPedIK::LOOKAROUND_HEAD_ONLY;
 		}
-	} else if (distRightEntry < distLeftEntry) {
-		enterPos = rightEntryPos;
-		m_vehEnterType = TRAIN_POS_RIGHT_ENTRY;
-	} else {
-		enterPos = leftEntryPos;
-		m_vehEnterType = TRAIN_POS_LEFT_ENTRY;
 	}
-
-	return 1;
 }
 
 // --MIAMI: Done
-uint8
-CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos)
-{
-	GetNearestTrainPedPosition(train, doorPos);
-/*
-	// Not used.
-	CVehicleModelInfo* trainModel = (CVehicleModelInfo*)CModelInfo::GetModelInfo(train->m_modelIndex);
-	CMatrix trainMat = CMatrix(train->GetMatrix());
-
-	doorPos = trainModel->m_positions[m_vehEnterType];
-	doorPos.x -= 1.5f;
-	doorPos = Multiply3x3(trainMat, doorPos);
-	doorPos += train->GetPosition();
-*/
-	return 1;
-}
-
-#ifdef GTA_TRAIN
 void
-CPed::LineUpPedWithTrain(void)
+CPed::SetLookFlag(CEntity *target, bool keepTryingToLook, bool cancelPrevious)
 {
-	CVector lineUpPos;
-	CVehicleModelInfo *trainModel = (CVehicleModelInfo *)CModelInfo::GetModelInfo(m_pMyVehicle->GetModelIndex());
-	CVector enterOffset(1.5f, 0.0f, -0.2f);
-
-	m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-	m_fRotationCur = m_pMyVehicle->GetForward().Heading() - HALFPI;
-	m_fRotationDest = m_fRotationCur;
-
-	if (!bInVehicle) {
-		GetNearestTrainDoor(m_pMyVehicle, lineUpPos);
-		lineUpPos.z += 0.2f;
-	} else {
-		if (m_pMyVehicle->pPassengers[TRAIN_POS_LEFT_ENTRY] == this) {
-
-			lineUpPos = trainModel->m_positions[TRAIN_POS_LEFT_ENTRY] - enterOffset;
-
-		} else if (m_pMyVehicle->pPassengers[TRAIN_POS_MID_ENTRY] == this) {
-
-			lineUpPos = trainModel->m_positions[TRAIN_POS_MID_ENTRY] - enterOffset;
-
-		} else if (m_pMyVehicle->pPassengers[TRAIN_POS_RIGHT_ENTRY] == this) {
-
-			lineUpPos = trainModel->m_positions[TRAIN_POS_RIGHT_ENTRY] - enterOffset;
+	if (m_lookTimer < CTimer::GetTimeInMilliseconds() || cancelPrevious) {
+		bIsLooking = true;
+		bIsRestoringLook = false;
+		m_pLookTarget = target;
+		m_pLookTarget->RegisterReference((CEntity**)&m_pLookTarget);
+		m_fLookDirection = 999999.0f;
+		m_lookTimer = 0;
+		bKeepTryingToLook = keepTryingToLook;
+		if (CanUseTorsoWhenLooking()) {
+			m_pedIK.m_flags &= ~CPedIK::LOOKAROUND_HEAD_ONLY;
 		}
-		lineUpPos = Multiply3x3(m_pMyVehicle->GetMatrix(), lineUpPos);
-		lineUpPos += m_pMyVehicle->GetPosition();
-	}
-
-	if (m_pVehicleAnim) {
-		float percentageLeft = m_pVehicleAnim->GetTimeLeft() / m_pVehicleAnim->hierarchy->totalLength;
-		lineUpPos += (GetPosition() - lineUpPos) * percentageLeft;
 	}
-
-	SetPosition(lineUpPos);
-	SetHeading(m_fRotationCur);
 }
 
-void
-CPed::EnterTrain(void)
-{
-	LineUpPedWithTrain();
-}
-
-void
-CPed::ExitTrain(void)
-{
-	LineUpPedWithTrain();
-}
-#endif
-
 // --MIAMI: Done
 void
-CPed::ExitCar(void)
-{
-	if (!m_pVehicleAnim) {
-		if (InVehicle()) {
-			if (m_pMyVehicle->IsBike()) {
-				if (m_vehEnterType == CAR_BOOT || m_vehEnterType == CAR_BUMP_REAR) {
-					((CBike*)m_pMyVehicle)->KnockOffRider(WEAPONTYPE_UNARMED, 0, this, false);
-				}
-			} else if (m_pMyVehicle->IsCar()) {
-				if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_LHS)) {
-					((CAutomobile*)m_pMyVehicle)->KnockPedOutCar(WEAPONTYPE_UNIDENTIFIED, CAR_DOOR_LF, this);
-				} else if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_RHS)) {
-					((CAutomobile*)m_pMyVehicle)->KnockPedOutCar(WEAPONTYPE_UNIDENTIFIED, CAR_DOOR_RF, this);
-				}
-			}
-		}
-		return;
-	}
+CPed::ClearLookFlag(void) {
+	if (bIsLooking) {
+		bIsLooking = false;
+		bIsRestoringLook = true;
+		bShakeFist = false;
 
-	AnimationId exitAnim = (AnimationId) m_pVehicleAnim->animId;
-	float animTime = m_pVehicleAnim->currentTime;
+		if (CanUseTorsoWhenLooking())
+			m_pedIK.m_flags &= ~CPedIK::LOOKAROUND_HEAD_ONLY;
 
-	if (exitAnim == ANIM_BIKE_GETOFF_BACK) {
-		if (animTime > 0.35f && m_pMyVehicle && m_pMyVehicle->IsBike())
-			((CBike*)m_pMyVehicle)->KnockOffRider(WEAPONTYPE_UNARMED, 0, this, false);
+		if (IsPlayer())
+			m_lookTimer = CTimer::GetTimeInMilliseconds() + 2000;
 		else
-			LineUpPedWithCar(LINE_UP_TO_CAR_FALL);
-
-	} else if (exitAnim == ANIM_CAR_ROLLOUT_LHS || exitAnim == ANIM_CAR_ROLLOUT_RHS) {
-		if (animTime > 0.07f && m_pMyVehicle && m_pMyVehicle->IsCar()) {
-			if (exitAnim == ANIM_CAR_ROLLOUT_LHS) {
-				((CAutomobile*)m_pMyVehicle)->KnockPedOutCar(WEAPONTYPE_UNIDENTIFIED, CAR_DOOR_LF, this);
-			} else {
-				((CAutomobile*)m_pMyVehicle)->KnockPedOutCar(WEAPONTYPE_UNIDENTIFIED, CAR_DOOR_RF, this);
-			}
-		} else {
-			LineUpPedWithCar(LINE_UP_TO_CAR_FALL);
-		}
-	} else {
-		m_pMyVehicle->ProcessOpenDoor(m_vehEnterType, exitAnim, animTime);
-
-		if (m_pSeekTarget) {
-			// Car is upside down
-			if (m_pMyVehicle->GetUp().z > -0.8f) {
-				if (exitAnim == ANIM_CAR_CLOSE_RHS || exitAnim == ANIM_CAR_CLOSE_LHS || animTime > 0.3f)
-					LineUpPedWithCar(LINE_UP_TO_CAR_END);
-				else
-					LineUpPedWithCar((m_pMyVehicle->GetModelIndex() == MI_DODO ? LINE_UP_TO_CAR_END : LINE_UP_TO_CAR_START));
-			}
-			else {
-				LineUpPedWithCar(LINE_UP_TO_CAR_END);
-			}
-		}
+			m_lookTimer = CTimer::GetTimeInMilliseconds() + 4000;
 
-		// If there is someone in front of the door, make him fall while we exit.
-		if (m_nPedState == PED_EXIT_CAR) {
-			CPed* foundPed = nil;
-			for (int i = 0; i < m_numNearPeds; i++) {
-				if ((m_nearPeds[i]->GetPosition() - GetPosition()).MagnitudeSqr2D() < SQR(0.2f)) {
-					foundPed = m_nearPeds[i];
-					break;
-				}
-			}
-			if(foundPed && (!foundPed->IsPlayer() || m_nPedType == PEDTYPE_COP || m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS))
-				if (animTime > 0.4f && foundPed->IsPedInControl())
-					foundPed->SetFall(1000, ANIM_KO_SKID_FRONT, 1);
+		if (m_nPedState == PED_LOOK_HEADING || m_nPedState == PED_LOOK_ENTITY) {
+			ClearLook();
 		}
 	}
 }
 
 // --MIAMI: Done
 void
-CPed::Fall(void)
+CPed::MoveHeadToLook(void)
 {
-	if (m_getUpTimer != UINT32_MAX && CTimer::GetTimeInMilliseconds() > m_getUpTimer && bIsStanding)
-		ClearFall();
-
-	CAnimBlendAssociation *firstPartialAssoc;
-	CAnimBlendAssociation *fallAssoc;
-
-	if (IsPlayer() && (bKnockedUpIntoAir || bKnockedOffBike) && !bIsStanding) {
-		firstPartialAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
-
-		// What???
-		if (firstPartialAssoc && (firstPartialAssoc->animId == ANIM_FALL_BACK || firstPartialAssoc->animId == ANIM_FALL_FRONT))
-			fallAssoc = firstPartialAssoc;
-		else
-			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_BACK);
-
-		if (!fallAssoc)
-			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FRONT);
-
-		if (!fallAssoc && firstPartialAssoc && 0.8f * firstPartialAssoc->hierarchy->totalLength < firstPartialAssoc->currentTime) {
-			if (firstPartialAssoc->flags & ASSOC_FRONTAL) {
-				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_FRONT, 8.0f);
-			} else {
-				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_BACK, 8.0f);
-			}
-		} else if (fallAssoc && fallAssoc->blendAmount > 0.3f && fallAssoc->blendDelta >= 0.0f)	{
-			float time = fallAssoc->currentTime;
-
-			if (time > 0.667f && time - fallAssoc->timeStep <= 0.667f) {
-				fallAssoc->SetCurrentTime(0.0f);
-				fallAssoc->SetRun();
-			}
-		}
-	} else if ((bKnockedUpIntoAir || bKnockedOffBike) && bIsStanding && !bWasStanding) {
-		fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_BACK);
+	CVector lookPos;
 
-		if (!fallAssoc)
-			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FRONT);
+	if (m_lookTimer && CTimer::GetTimeInMilliseconds() > m_lookTimer) {
+		ClearLookFlag();
+	} 
 
-		if (fallAssoc) {
-			bKnockedUpIntoAir = false;
-			bKnockedOffBike = false;
-			fallAssoc->speed = 3.0f;
-			if (IsPlayer())
-				Say(SOUND_PED_LAND);
+	if (bIsLooking || bIsRestoringLook)
+		if (!CanUseTorsoWhenLooking())
+			m_pedIK.m_flags |= CPedIK::LOOKAROUND_HEAD_ONLY;
 
+	if (m_pLookTarget) {
+		if (m_pLookTarget->IsPed()) {
+			((CPed*)m_pLookTarget)->m_pedIK.GetComponentPosition(lookPos, PED_MID);
 		} else {
-			firstPartialAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
-			if (firstPartialAssoc && !firstPartialAssoc->IsRunning()) {
-				bKnockedUpIntoAir = false;
-				bKnockedOffBike = false;
-			}
-		}
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::Fight(void)
-{
-	CAnimBlendAssociation *currentAssoc, *animAssoc;
-	bool fightWithWeapon = false;
-
-	eWeaponType weapon = GetWeapon()->m_eWeaponType;
-	CWeaponInfo *weaponInfo = CWeaponInfo::GetWeaponInfo(weapon);
-
-	if (weaponInfo->m_bFightMode && weapon != WEAPONTYPE_UNARMED) {
-		fightWithWeapon = true;
-		tFightMoves[FIGHTMOVE_MELEE1].startFireTime = weaponInfo->m_fAnimFrameFire;
-		tFightMoves[FIGHTMOVE_MELEE1].endFireTime = weaponInfo->m_fAnimLoopEnd;
-		tFightMoves[FIGHTMOVE_MELEE2].startFireTime = weaponInfo->m_fAnim2FrameFire;
-		tFightMoves[FIGHTMOVE_MELEE2].endFireTime = weaponInfo->m_fAnim2LoopEnd;
-		tFightMoves[FIGHTMOVE_MELEE3].startFireTime = weaponInfo->m_fAnim2FrameFire;
-		tFightMoves[FIGHTMOVE_MELEE3].endFireTime = weaponInfo->m_fAnim2LoopEnd;
-	}
-
-	switch (m_curFightMove) {
-		case FIGHTMOVE_NULL:
-			return;
-		case FIGHTMOVE_IDLE2NORM:
-			m_curFightMove = FIGHTMOVE_NULL;
-			RestorePreviousState();
-
-			// FIX: Uninitialized
-			currentAssoc = nil;
-			break;
-		case FIGHTMOVE_IDLE:
-			currentAssoc = nil;
-			break;
-		default:
-			currentAssoc = RpAnimBlendClumpGetAssociation(GetClump(), tFightMoves[m_curFightMove].animId);
-			break;
-	}
-
-	if (m_curFightMove == FIGHTMOVE_SHUFFLE_F && !currentAssoc)
-		currentAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FIGHT_SH_BACK);
-
-	if (IsPlayer() && currentAssoc && weapon == WEAPONTYPE_KATANA) {
-		if (m_curFightMove == FIGHTMOVE_MELEE1 || m_curFightMove == FIGHTMOVE_MELEE2) {
-			static float streakDelay = 0.2f;
-
-			if (tFightMoves[m_curFightMove].startFireTime - streakDelay < currentAssoc->currentTime &&
-				streakDelay + tFightMoves[m_curFightMove].endFireTime > currentAssoc->currentTime) {
-
-				// TODO(Miami): AddWeaponStreak
-				// CSpecialFX::AddWeaponStreak(v2->m_weapons[(char)v2->m_currentWeapon].nWeaponId);
-			}
-		}
-	}
-
-	if (!bIsAttacking && IsPlayer()) {
-		if (currentAssoc) {
-			currentAssoc->blendDelta = -1000.0f;
-			currentAssoc->flags |= ASSOC_DELETEFADEDOUT;
-			currentAssoc->flags &= ~ASSOC_RUNNING;
+			lookPos = m_pLookTarget->GetPosition();
 		}
-		if (m_takeAStepAfterAttack)
-			EndFight(ENDFIGHT_WITH_A_STEP);
-		else
-			EndFight(ENDFIGHT_FAST);
 
-	} else if (currentAssoc && m_fightState > FIGHTSTATE_MOVE_FINISHED) {
-		float animTime = currentAssoc->currentTime;
-		FightMove &curMove = tFightMoves[m_curFightMove];
-		if (curMove.hitLevel != HITLEVEL_NULL && animTime > curMove.startFireTime && animTime <= curMove.endFireTime && m_fightState >= FIGHTSTATE_NO_MOVE) {
-
-			if (animTime > curMove.startFireTime && animTime - currentAssoc->timeStep < curMove.startFireTime &&
-				(IsPlayer() || weapon != WEAPONTYPE_UNARMED)) {
-
-				DMAudio.PlayOneShot(m_audioEntityId, SOUND_MELEE_ATTACK_START, weapon << 8);
-			}
-
-			CVector touchingNodePos(0.0f, 0.0f, 0.0f);
-
-			switch (m_curFightMove) {
-				case FIGHTMOVE_KNEE:
-					TransformToNode(touchingNodePos, PED_LOWERLEGR);
-					break;
-				case FIGHTMOVE_PUNCHHOOK:
-				case FIGHTMOVE_PUNCHJAB:
-					TransformToNode(touchingNodePos, PED_HANDL);
-					break;
-				case FIGHTMOVE_LONGKICK:
-				case FIGHTMOVE_ROUNDHOUSE:
-				case FIGHTMOVE_FWDLEFT:
-				case FIGHTMOVE_BACKRIGHT:
-				case FIGHTMOVE_GROUNDKICK:
-					TransformToNode(touchingNodePos, PED_FOOTR);
-					break;
-				case FIGHTMOVE_FWDRIGHT:
-					TransformToNode(touchingNodePos, PED_HEAD);
-					break;
-				case FIGHTMOVE_BACKKICK:
-				case FIGHTMOVE_BACKFLIP:
-					TransformToNode(touchingNodePos, PED_FOOTL);
-					break;
-				case FIGHTMOVE_BACKLEFT:
-					TransformToNode(touchingNodePos, PED_UPPERARML);
-					break;
-				default:
-					TransformToNode(touchingNodePos, PED_HANDR);
-					break;
+		if (!m_pedIK.LookAtPosition(lookPos)) {
+			if (!bKeepTryingToLook) {
+				ClearLookFlag();
 			}
-
-			FightStrike(touchingNodePos, fightWithWeapon);
-			m_fightButtonPressure = 0;
 			return;
 		}
 
-		if (curMove.hitLevel != HITLEVEL_NULL) {
-			if (animTime > curMove.endFireTime && weaponInfo->m_AnimToPlay != ASSOCGRP_KNIFE) {
-				if (IsPlayer())
-					currentAssoc->speed = 1.0f;
-				else
-					currentAssoc->speed = 0.8f;
-			}
-
-			if (IsPlayer() && !nPlayerInComboMove && !fightWithWeapon) {
-				if (curMove.comboFollowOnTime > 0.0f && m_fightButtonPressure != 0 && animTime > curMove.comboFollowOnTime) {
-
-					m_lastFightMove = m_curFightMove;
-					// Notice that it increases fight move index, because we're in combo!
-					animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, tFightMoves[++m_curFightMove].animId, 8.0f);
-					animAssoc->SetFinishCallback(FinishFightMoveCB, this);
-					animAssoc->SetCurrentTime(0.1f * animAssoc->hierarchy->totalLength);
-					animAssoc->speed = 0.8f;
-					m_fightButtonPressure = 0;
-					nPlayerInComboMove = 1;
-				}
-			}
-		}
-
-	} else if (GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED && GetWeapon()->m_eWeaponType != WEAPONTYPE_BRASSKNUCKLE && !fightWithWeapon) {
-		EndFight(ENDFIGHT_FAST);
-
-	} else if (m_fightButtonPressure != 0) {
-		if (!IsPlayer())
-			Say(SOUND_PED_ATTACK);
-
-		if (m_curFightMove != FIGHTMOVE_IDLE)
-			m_lastFightMove = m_curFightMove;
+		if (!bShakeFist || bIsAimingGun || bIsRestoringGun)
+			return;
 
-		m_curFightMove = IsPlayer() ? ChooseAttackPlayer(m_fightButtonPressure, fightWithWeapon) : ChooseAttackAI(m_fightButtonPressure, fightWithWeapon);
+		if (m_nPedState == PED_ANSWER_MOBILE)
+			return;
 
-		if (m_curFightMove != FIGHTMOVE_IDLE) {
+		if (m_lookTimer - CTimer::GetTimeInMilliseconds() >= 1000)
+			return;
 
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), m_curFightMove < FIGHTMOVE_MELEE1 ? ASSOCGRP_STD : weaponInfo->m_AnimToPlay,
-				tFightMoves[m_curFightMove].animId, 8.0f);
+		bool handFreeToMove = false;
+		AnimationId animToPlay = NUM_STD_ANIMS;
 
-			if (weaponInfo->m_AnimToPlay != ASSOCGRP_KNIFE || m_curFightMove < FIGHTMOVE_MELEE1) {
-				if (m_curFightMove == FIGHTMOVE_BACKKICK)
-					animAssoc->speed = 1.15f;
-				else
-					animAssoc->speed = 0.8f;
-			} else {
-				switch (GetWeapon()->m_eWeaponType) {
-					case WEAPONTYPE_SCREWDRIVER:
-					case WEAPONTYPE_KNIFE:
-						animAssoc->speed = 1.05f;
-						break;
-					case WEAPONTYPE_GOLFCLUB:
-					case WEAPONTYPE_NIGHTSTICK:
-					case WEAPONTYPE_BASEBALLBAT:
-					case WEAPONTYPE_HAMMER:
-					case WEAPONTYPE_KATANA:
-						animAssoc->speed = 0.8f;
-						break;
-					case WEAPONTYPE_CLEAVER:
-					case WEAPONTYPE_MACHETE:
-						animAssoc->speed = 0.9f;
-						break;
-				}
-			}
+		if (!GetWeapon()->IsType2Handed() && GetWeapon()->m_eWeaponType != WEAPONTYPE_ROCKETLAUNCHER)
+			handFreeToMove = true;
 
-			if (m_fightState == FIGHTSTATE_MOVE_FINISHED && animAssoc->currentTime != 0.0f) {
-				animAssoc->SetRun();
-				if (!IsPlayer())
-					animAssoc->SetCurrentTime(0.0f);
-			}
-			if (IsPlayer())
-				animAssoc->SetCurrentTime(0.08f);
+		if (IsPlayer() && handFreeToMove) {
 
-			animAssoc->SetFinishCallback(FinishFightMoveCB, this);
-			m_fightButtonPressure = 0;
-		}
-		m_fightState = FIGHTSTATE_NO_MOVE;
-	} else if (m_takeAStepAfterAttack && m_curFightMove != FIGHTMOVE_SHUFFLE_F
-#ifndef FIX_BUGS
-		&& CheckForPedsOnGroundToAttack(this, nil) == 4) {
+			if (m_pLookTarget->IsPed()) {
+#ifdef FIX_BUGS
+				if (m_pedStats->m_temper > 49 || ((CPed*)m_pLookTarget)->m_nPedType == PEDTYPE_COP)
 #else
-		&& CheckForPedsOnGroundToAttack(this, nil) == PED_IN_FRONT_OF_ATTACKER) {
+				if (m_pedStats->m_temper < 49 || ((CPed*)m_pLookTarget)->m_nPedType == PEDTYPE_COP)
 #endif
-		m_lastFightMove = m_curFightMove;
-		m_curFightMove = FIGHTMOVE_SHUFFLE_F;
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), tFightMoves[m_curFightMove].animId);
-
-		if (animAssoc) {
-			animAssoc->SetCurrentTime(0.0f);
-			animAssoc->blendDelta = 4.0f;
-			animAssoc->SetRun();
-		} else {
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, tFightMoves[m_curFightMove].animId, 32.0f);
-		}
-		animAssoc->SetFinishCallback(FinishFightMoveCB, this);
-		m_fightState = FIGHTSTATE_NO_MOVE;
-		m_fightButtonPressure = 0;
-		m_takeAStepAfterAttack = false;
-
-	} else if (m_takeAStepAfterAttack) {
-		EndFight(ENDFIGHT_FAST);
-
-	} else if (m_curFightMove == FIGHTMOVE_IDLE) {
-		if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-			EndFight(ENDFIGHT_NORMAL);
+					animToPlay = ANIM_FUCKU;
+				else if(m_pedStats->m_temper < 47)
+					animToPlay = ANIM_FIGHT_PPUNCH;
+			} else {
+				if (m_pedStats->m_temper > 49 || m_pLookTarget->GetModelIndex() == MI_POLICE)
+					animToPlay = ANIM_FUCKU;
+			}
+		} else if (handFreeToMove && (CGeneral::GetRandomNumber() & 1)) {
+			animToPlay = ANIM_FUCKU;
 		}
 
-	} else {
-		m_lastFightMove = m_curFightMove;
-		m_curFightMove = FIGHTMOVE_IDLE;
-		if (IsPlayer())
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 500;
-		else
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 2000;
-	}
-}
-
-// --MIAMI: Done
-// Some helper function which doesn't exist in og game.
-inline void
-SelectClosestNodeForSeek(CPed *ped, CPathNode *node, CVector2D closeDist, CVector2D farDist, CPathNode *closeNode, CPathNode *closeNode2, int runCount = 3)
-{
-	for (int i = 0; i < node->numLinks; i++) {
-
-		CPathNode *testNode = &ThePaths.m_pathNodes[ThePaths.ConnectedNode(i + node->firstLink)];
-
-		if (testNode && testNode != closeNode && testNode != closeNode2) {
-			CVector2D posDiff(ped->m_vecSeekPos - testNode->GetPosition());
-			float dist = posDiff.MagnitudeSqr();
-
-			if (farDist.MagnitudeSqr() > dist) {
+		if (animToPlay != NUM_STD_ANIMS) {
+			CAnimBlendAssociation *newAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animToPlay, 4.0f);
 
-				if (closeDist.MagnitudeSqr() > dist) {
-					ped->m_pNextPathNode = (closeNode2 ? closeNode2 : testNode);
-					farDist = posDiff;
-				} else {
-					ped->m_pNextPathNode = closeNode;
-					closeDist = posDiff;
-				}
+			if (newAssoc) {
+				newAssoc->flags |= ASSOC_FADEOUTWHENDONE;
+				newAssoc->flags |= ASSOC_DELETEFADEDOUT;
 			}
-
-			if (--runCount > 0)
-				SelectClosestNodeForSeek(ped, testNode, closeDist, farDist, closeNode, (closeNode2 ? closeNode2 : testNode), runCount);
 		}
+		bShakeFist = false;
+	} else if (m_fLookDirection == 999999.0f) {
+		ClearLookFlag();
+	} else if (!m_pedIK.LookInDirection(m_fLookDirection, 0.0f)) {
+		if (!bKeepTryingToLook)
+			ClearLookFlag();
 	}
 }
 
 // --MIAMI: Done
-bool
-CPed::FindBestCoordsFromNodes(CVector unused, CVector *bestCoords)
+void
+CPed::RestoreHeadPosition(void)
 {
-	if (m_pNextPathNode || !bUsePedNodeSeek)
-		return false;
-
-	const CVector &ourPos = GetPosition();
-
-	int closestNodeId = ThePaths.FindNodeClosestToCoors(GetPosition(), 1, 999999.9f);
-
-	CVector seekObjPos = m_vecSeekPos;
-	seekObjPos.z += 1.0f;
-
-	if (CWorld::GetIsLineOfSightClear(ourPos, seekObjPos, true, false, false, true, false, false, false))
-		return false;
-
-	m_pNextPathNode = nil;
-
-	CVector2D seekPosDist (m_vecSeekPos - ourPos);
-
-	CPathNode *closestNode = &ThePaths.m_pathNodes[closestNodeId];
-	CVector2D closeDist(m_vecSeekPos - closestNode->GetPosition());
-
-	SelectClosestNodeForSeek(this, closestNode, closeDist, seekPosDist, closestNode, nil);
-
-	if (m_pNextPathNode) {
-
-		// Function above decided that directly going to next node makes more sense then seeking the object.
-		CVector correctedCoords = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
+	if(!CanUseTorsoWhenLooking())
+		m_pedIK.m_flags |= CPedIK::LOOKAROUND_HEAD_ONLY;
 
-		if ((correctedCoords - ourPos).MagnitudeSqr2D() < seekPosDist.MagnitudeSqr()) {
-			*bestCoords = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
-			return true;
-		}
-		m_pNextPathNode = nil;
+	if (m_pedIK.RestoreLookAt()) {
+		bIsRestoringLook = false;
+		if(CanUseTorsoWhenLooking())
+			m_pedIK.m_flags &= ~CPedIK::LOOKAROUND_HEAD_ONLY;
 	}
-
-	return false;
 }
 
 // --MIAMI: Done
 void
-CPed::FinishDieAnimCB(CAnimBlendAssociation *animAssoc, void *arg)
+CPed::SetAimFlag(float angle)
 {
-	CPed *ped = (CPed*)arg;
-
-	if (ped->bIsPedDieAnimPlaying)
-		ped->bIsPedDieAnimPlaying = false;
-}
+	bIsAimingGun = true;
+	bIsRestoringGun = false;
+	m_fLookDirection = angle;
+	m_lookTimer = 0;
+	m_pLookTarget = nil;
+	m_pSeekTarget = nil;
 
-// --MIAMI: Done
-void
-CPed::FinishFightMoveCB(CAnimBlendAssociation *animAssoc, void *arg)
-{
-	CPed *ped = (CPed*)arg;
+	if (bIsDucking)
+		m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
 
-	if (tFightMoves[ped->m_curFightMove].animId == animAssoc->animId) {
-		ped->m_fightState = FIGHTSTATE_MOVE_FINISHED;
-		animAssoc->blendDelta = -1000.0f;
-	}
+	if (CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_bCanAimWithArm)
+		m_pedIK.m_flags |= CPedIK::AIMS_WITH_ARM;
+	else
+		m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
 }
 
 // --MIAMI: Done
 void
-CPed::FinishHitHeadCB(CAnimBlendAssociation *animAssoc, void *arg)
+CPed::SetAimFlag(CEntity *to)
 {
-	CPed *ped = (CPed*)arg;
-
-	if (animAssoc) {
-		animAssoc->blendDelta = -4.0f;
-		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-	}
-
-	if (ped->m_nPedState == PED_JUMP)
-		ped->RestorePreviousState();
-
-	ped->bIsLanding = false;
+	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;
 }
 
 // --MIAMI: Done
 void
-CPed::FinishJumpCB(CAnimBlendAssociation *animAssoc, void *arg)
+CPed::ClearAimFlag(void)
 {
-	CPed *ped = (CPed*)arg;
-
-	ped->bResetWalkAnims = true;
-	ped->bIsLanding = false;
+	if (bIsAimingGun) {
+		bIsAimingGun = false;
+		bIsRestoringGun = true;
+		m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
+		m_lookTimer = 0;
+	}
 
-	animAssoc->blendDelta = -1000.0f;
+	if (IsPlayer())
+		((CPlayerPed*)this)->m_fFPSMoveHeading = 0.0f;
 }
 
 // --MIAMI: Done
 void
-CPed::FinishLaunchCB(CAnimBlendAssociation *animAssoc, void *arg)
+CPed::AimGun(void)
 {
-	CPed *ped = (CPed*)arg;
-
-	if (ped->m_nPedState != PED_JUMP)
-		return;
-
-	CVector forward(0.09f * ped->GetForward() + ped->GetPosition());
-	forward.z += CModelInfo::GetModelInfo(ped->GetModelIndex())->GetColModel()->spheres[2].center.z + 0.35f;
-
-	CEntity *obstacle = CWorld::TestSphereAgainstWorld(forward, 0.25f, nil, true, true, false, true, false, false);
-	if (!obstacle) {
-		// Forward of forward
-		forward += 0.15f * ped->GetForward();
-		forward.z += 0.15f;
-		obstacle = CWorld::TestSphereAgainstWorld(forward, 0.25f, nil, true, true, false, true, false, false);
-	}
-
-	if (!obstacle && CCullZones::CamStairsForPlayer() && CCullZones::FindZoneWithStairsAttributeForPlayer())
-		obstacle = ped;
-
-	if (obstacle) {
-		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-		CAnimBlendAssociation *handsCoverAssoc = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_HIT_WALL, 8.0f);
-		handsCoverAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
-		handsCoverAssoc->SetFinishCallback(FinishHitHeadCB, ped);
-		ped->bIsLanding = true;
-		return;
-	}
-
-	float velocityFromAnim = 0.1f;
-	CAnimBlendAssociation *sprintAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), ANIM_SPRINT);
-
-	if (sprintAssoc) {
-		velocityFromAnim = 0.05f * sprintAssoc->blendAmount + 0.17f;
-	} else {
-		CAnimBlendAssociation *runAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), ANIM_RUN);
-		if (runAssoc) {
-			velocityFromAnim = 0.07f * runAssoc->blendAmount + 0.1f;
-		}
-	}
+	CVector vector;
 
-	if (ped->IsPlayer() || ped->m_pedInObjective && ped->m_pedInObjective->IsPlayer())
-		ped->ApplyMoveForce(0.0f, 0.0f, 8.5f);
-	else
-		ped->ApplyMoveForce(0.0f, 0.0f, 4.5f);
-	
-	if (sq(velocityFromAnim) > ped->m_vecMoveSpeed.MagnitudeSqr2D() || ped->m_pCurrentPhysSurface) {
+	if (IsPlayer() && bIsDucking)
+		m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
 
-#ifdef FREE_CAM
-		if (TheCamera.Cams[0].Using3rdPersonMouseCam() && !CCamera::bFreeCam) {
-#else
-		if (TheCamera.Cams[0].Using3rdPersonMouseCam()) {
-#endif
-			float fpsAngle = ped->WorkOutHeadingForMovingFirstPerson(ped->m_fRotationCur);
-			ped->m_vecMoveSpeed.x = -velocityFromAnim * Sin(fpsAngle);
-			ped->m_vecMoveSpeed.y = velocityFromAnim * Cos(fpsAngle);
+	if (m_pSeekTarget) {
+		if (m_pSeekTarget->IsPed()) {
+			((CPed*)m_pSeekTarget)->m_pedIK.GetComponentPosition(vector, PED_MID);
 		} else {
-			ped->m_vecMoveSpeed.x = -velocityFromAnim * Sin(ped->m_fRotationCur);
-			ped->m_vecMoveSpeed.y = velocityFromAnim * Cos(ped->m_fRotationCur);
-		}
-
-		if (ped->m_pCurrentPhysSurface) {
-			ped->m_vecMoveSpeed.x += ped->m_pCurrentPhysSurface->m_vecMoveSpeed.x;
-			ped->m_vecMoveSpeed.y += ped->m_pCurrentPhysSurface->m_vecMoveSpeed.y;
+			vector = m_pSeekTarget->GetPosition();
 		}
-	}
-
-	ped->bIsStanding = false;
-	ped->bIsInTheAir = true;
-	animAssoc->blendDelta = -1000.0f;
-	CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_JUMP_GLIDE);
-
-	if (ped->bDoBloodyFootprints) {
-		CVector bloodPos(0.0f, 0.0f, 0.0f);
-		ped->TransformToNode(bloodPos, PED_FOOTL);
 
-		bloodPos.z -= 0.1f;
-		bloodPos += 0.2f * ped->GetForward();
-
-		CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &bloodPos,
-			0.26f * ped->GetForward().x,
-			0.26f * ped->GetForward().y,
-			0.14f * ped->GetRight().x,
-			0.14f * ped->GetRight().y,
-			255, 255, 0, 0, 4.0f, 3000, 1.0f);
-
-		bloodPos = CVector(0.0f, 0.0f, 0.0f);
-		ped->TransformToNode(bloodPos, PED_FOOTR);
+		if (!IsPlayer())
+			Say(SOUND_PED_ATTACK);
 
-		bloodPos.z -= 0.1f;
-		bloodPos += 0.2f * ped->GetForward();
-		CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &bloodPos,
-			0.26f * ped->GetForward().x,
-			0.26f * ped->GetForward().y,
-			0.14f * ped->GetRight().x,
-			0.14f * ped->GetRight().y,
-			255, 255, 0, 0, 4.0f, 3000, 1.0f);
+		bCanPointGunAtTarget = m_pedIK.PointGunAtPosition(vector);
+		if (m_pLookTarget != m_pSeekTarget) {
+			SetLookFlag(m_pSeekTarget, true, true);
+		}
 
-		if (ped->m_bloodyFootprintCountOrDeathTime <= 40) {
-			ped->m_bloodyFootprintCountOrDeathTime = 0;
-			ped->bDoBloodyFootprints = false;
+	} else {
+		if (IsPlayer()) {
+			bCanPointGunAtTarget = m_pedIK.PointGunInDirection(m_fLookDirection, ((CPlayerPed*)this)->m_fFPSMoveHeading);
 		} else {
-			ped->m_bloodyFootprintCountOrDeathTime -= 40;
+			bCanPointGunAtTarget = m_pedIK.PointGunInDirection(m_fLookDirection, 0.0f);
 		}
 	}
 }
 
 // --MIAMI: Done
 void
-CPed::FinishedWaitCB(CAnimBlendAssociation *animAssoc, void *arg)
+CPed::RestoreGunPosition(void)
 {
-	CPed *ped = (CPed*)arg;
+	if (bIsLooking) {
+		m_pedIK.m_flags &= ~CPedIK::LOOKAROUND_HEAD_ONLY;
+		bIsRestoringGun = false;
+	} else if (m_pedIK.RestoreGunPosn()) {
+		bIsRestoringGun = false;
+	} else {
+		if (IsPlayer())
+			((CPlayerPed*)this)->m_fFPSMoveHeading = 0.0f;
+	}
+}
 
-	ped->m_nWaitTimer = 0;
-	ped->RestoreHeadingRate();
-	ped->Wait();
+// --MIAMI: Done
+bool
+CPed::CanWeRunAndFireWithWeapon(void)
+{
+	return CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_bCanAimWithArm;
 }
 
 // --MIAMI: Done
 void
-CPed::Wait(void)
+CPed::ScanForInterestingStuff(void)
 {
-	AnimationId mustHaveAnim = NUM_STD_ANIMS;
-	CAnimBlendAssociation *animAssoc;
-	CPed *pedWeLook;
-
-	if (DyingOrDead()) {
-		ClearWaitState();
-		RestoreHeadingRate();
+	if (!IsPedInControl())
 		return;
-	}
-
-	switch (m_nWaitState) {
-
-		case WAITSTATE_TRAFFIC_LIGHTS:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				if (CTrafficLights::LightForPeds() == PED_LIGHTS_WALK) {
-					ClearWaitState();
-					SetMoveState(PEDMOVE_WALK);
-				}
-			}
-			break;
 
-		case WAITSTATE_CROSS_ROAD:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				if (CGeneral::GetRandomNumber() & 1 || !m_nWaitTimer)
-					ClearWaitState();
-				else
-					SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, nil);
-
-				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_HBHB);
-				if (animAssoc) {
-					animAssoc->blendDelta = -8.0f;
-					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-				}
-			}
-			break;
+	if (m_objective != OBJECTIVE_NONE)
+		return;
 
-		case WAITSTATE_CROSS_ROAD_LOOK:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				ClearWaitState();
-				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ROAD_CROSS);
-				if (animAssoc) {
-					animAssoc->blendDelta = -8.0f;
-					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-				}
-			}
-			break;
+	if (CharCreatedBy == MISSION_CHAR)
+		return;
 
-		case WAITSTATE_DOUBLEBACK:
-			if (CTimer::GetTimeInMilliseconds() <= m_nWaitTimer) {
-				uint32 timeLeft = m_nWaitTimer - CTimer::GetTimeInMilliseconds();
-				if (timeLeft < 2500 && timeLeft > 2000) {
-					m_nWaitTimer -= 500;
-					CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_XPRESS_SCRATCH, 4.0f);
-				}
-			} else {
-				ClearWaitState();
-				SetMoveState(PEDMOVE_WALK);
-			}
-			break;
+	LookForSexyPeds();
+	LookForSexyCars();
+	if (LookForInterestingNodes())
+		return;
 
-		case WAITSTATE_HITWALL:
-			if (CTimer::GetTimeInMilliseconds() <= m_nWaitTimer) {
-				if (m_collidingThingTimer > CTimer::GetTimeInMilliseconds()) {
-					m_collidingThingTimer = CTimer::GetTimeInMilliseconds() + 2500;
-				}
-			} else {
-				ClearWaitState();
-			}
-			break;
+	if (m_nPedType == PEDTYPE_CRIMINAL && m_hitRecoverTimer < CTimer::GetTimeInMilliseconds()) {
+		if (CGeneral::GetRandomNumber() % 100 < 10) {
+			int mostExpensiveVehAround = -1;
+			int bestMonetaryValue = 0;
 
-		case WAITSTATE_TURN180:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				ClearWaitState();
-				m_fRotationCur = m_fRotationCur + PI;
-				if (m_nPedState == PED_INVESTIGATE)
-					ClearInvestigateEvent();
-			}
+			CVector pos = GetPosition();
+			int16 lastVehicle;
+			CEntity *vehicles[8];
+			CWorld::FindObjectsInRange(pos, 10.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
 
-			if (m_collidingThingTimer > CTimer::GetTimeInMilliseconds()) {
-				m_collidingThingTimer = CTimer::GetTimeInMilliseconds() + 2500;
-			}
-			break;
+			for (int i = 0; i < lastVehicle; i++) {
+				CVehicle* veh = (CVehicle*)vehicles[i];
 
-		case WAITSTATE_SURPRISE:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_HIT_WALL)) {
-					animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_XPRESS_SCRATCH, 4.0f);
-					animAssoc->SetFinishCallback(FinishedWaitCB, this);
-					m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
-				} else {
-					ClearWaitState();
+				if (veh->VehicleCreatedBy != MISSION_VEHICLE) {
+					if (veh->m_vecMoveSpeed.Magnitude() <= 0.1f && veh->IsVehicleNormal()
+						&& veh->IsCar() && bestMonetaryValue < veh->pHandling->nMonetaryValue) {
+						mostExpensiveVehAround = i;
+						bestMonetaryValue = veh->pHandling->nMonetaryValue;
+					}
 				}
 			}
-			break;
-
-		case WAITSTATE_STUCK:
-			if (CTimer::GetTimeInMilliseconds() <= m_nWaitTimer)
-				break;
-
-			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_TIRED);
-
-			if (!animAssoc)
-				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_TURN_180);
-			if (!animAssoc)
-				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_XPRESS_SCRATCH);
-			if (!animAssoc)
-				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ROAD_CROSS);
-
-			if (animAssoc) {
-				if (animAssoc->IsPartial()) {
-					animAssoc->blendDelta = -8.0f;
-					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-				} else {
-					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-					CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 4.0f);
-				}
-
-				if (animAssoc->animId == ANIM_TURN_180) {
-					m_fRotationCur = CGeneral::LimitRadianAngle(PI + m_fRotationCur);
-					ClearWaitState();
-					SetMoveState(PEDMOVE_WALK);
-					m_nStoredMoveState = PEDMOVE_NONE;
-					m_panicCounter = 0;
-					return;
-				}
+			if (bestMonetaryValue > 2000 && mostExpensiveVehAround != -1 && vehicles[mostExpensiveVehAround]) {
+				SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, vehicles[mostExpensiveVehAround]);
+				m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 5000;
+				return;
 			}
+			m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 5000;
+		} else if (m_objective != OBJECTIVE_MUG_CHAR && !(CGeneral::GetRandomNumber() & 7)) {
+			CPed *charToMug = nil;
+			for (int i = 0; i < m_numNearPeds; ++i) {
+				CPed *nearPed = m_nearPeds[i];
 
-			AnimationId animToPlay;
-
-			switch (CGeneral::GetRandomNumber() & 3) {
-				case 0:
-					animToPlay = ANIM_ROAD_CROSS;
-					break;
-				case 1:
-					animToPlay = ANIM_IDLE_TIRED;
-					break;
-				case 2:
-					animToPlay = ANIM_XPRESS_SCRATCH;
-					break;
-				case 3:
-					animToPlay = ANIM_TURN_180;
-					break;
-				default:
+				if ((nearPed->GetPosition() - GetPosition()).MagnitudeSqr() > sq(7.0f))
 					break;
-			}
-
-			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animToPlay, 4.0f);
-
-			if (animToPlay == ANIM_TURN_180)
-				animAssoc->SetFinishCallback(FinishedWaitCB, this);
-
-			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(1500, 5000);
-			break;
-
-		case WAITSTATE_LOOK_ABOUT:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				ClearWaitState();
-				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_HBHB);
-				if (animAssoc) {
-					animAssoc->blendDelta = -8.0f;
-					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-				}
-			}
-			break;
-
-		case WAITSTATE_PLAYANIM_HANDSUP:
-			mustHaveAnim = ANIM_HANDSUP;
-			
-		case WAITSTATE_PLAYANIM_HANDSCOWER:
-			if (mustHaveAnim == NUM_STD_ANIMS)
-				mustHaveAnim = ANIM_HANDSCOWER;
-
-			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), mustHaveAnim);
-			pedWeLook = (CPed*) m_pLookTarget;
-
-			if ((!m_pLookTarget || !m_pLookTarget->IsPed() || pedWeLook->m_pPointGunAt)
-				&& m_nPedState != PED_FLEE_ENTITY
-				&& m_nPedState != PED_ATTACK
-				&& CTimer::GetTimeInMilliseconds() <= m_nWaitTimer
-				&& animAssoc) {
-
-				if (pedWeLook)
-					TurnBody();
-			} else {
-				ClearWaitState();
-				m_nWaitTimer = 0;
-				if (m_pLookTarget && m_pLookTarget->IsPed()) {
-					if (m_nPedState != PED_FLEE_ENTITY && m_nPedState != PED_ATTACK) {
-						if (bCrouchWhenScared) {
-							if (bIsDucking) {
-								ClearDuck(false);
-								SetDuck(10000, true);
-							}
-
-						} else if (m_pedStats->m_fear <= 100 - pedWeLook->m_pedStats->m_temper) {
-							if (GetWeapon()->IsTypeMelee()) {
-								if(m_pedStats->m_flags & STAT_GUN_PANIC) {
-									SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, m_pLookTarget);
-									if (m_nPedState == PED_FLEE_ENTITY || m_nPedState == PED_FLEE_POS) {
-
-										bUsePedNodeSeek = true;
-										m_pNextPathNode = nil;
-									}
-									if (m_nMoveState != PEDMOVE_RUN)
-										SetMoveState(PEDMOVE_WALK);
-
-									if (m_nPedType != PEDTYPE_COP) {
-										ProcessObjective();
-										SetMoveState(PEDMOVE_WALK);
-									}
-								} else {
-									SetObjective(OBJECTIVE_NONE);
-									SetWanderPath(CGeneral::GetRandomNumberInRange(0.0f, 8.0f));
-								}
-							} else {
-								SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, m_pLookTarget);
-								SetObjectiveTimer(20000);
-							}
-						} else {
-							SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, m_pLookTarget);
-							if (m_nPedState == PED_FLEE_ENTITY || m_nPedState == PED_FLEE_POS)
-							{
-								bUsePedNodeSeek = true;
-								m_pNextPathNode = nil;
-							}
-							SetMoveState(PEDMOVE_RUN);
-							Say(SOUND_PED_FLEE_RUN);
-						}
-					}
-				}
-				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), mustHaveAnim);
-				if (animAssoc) {
-					animAssoc->blendDelta = -4.0f;
-					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-				}
-			}
-			break;
-		case WAITSTATE_PLAYANIM_COWER:
-			mustHaveAnim = ANIM_HANDSCOWER;
-
-		case WAITSTATE_PLAYANIM_DUCK:
-			if (mustHaveAnim == NUM_STD_ANIMS)
-				mustHaveAnim = ANIM_DUCK_DOWN;
-
-		case WAITSTATE_PLAYANIM_TAXI:
-			if (mustHaveAnim == NUM_STD_ANIMS)
-				mustHaveAnim = ANIM_IDLE_TAXI;
 
-		case WAITSTATE_PLAYANIM_CHAT:
-			if (mustHaveAnim == NUM_STD_ANIMS)
-				mustHaveAnim = ANIM_IDLE_CHAT;
-
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), mustHaveAnim);
-				if (animAssoc) {
-					animAssoc->blendDelta = -4.0f;
-					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-				}
-				if (m_attractor && m_objective == OBJECTIVE_WAIT_ON_FOOT_AT_ICE_CREAM_VAN) {
-					GetPedAttractorManager()->BroadcastDeparture(this, m_attractor);
-					bBoughtIceCream = true;
-				}
-				ClearWaitState();
-			} 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) {
-
-						if (m_pLookTarget)
-							m_pLookTarget->CleanUpOldReference(&m_pLookTarget);
-						m_pLookTarget = m_pedInObjective;
-						m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
-						TurnBody();
-					}
+				if ((nearPed->m_nPedType == PEDTYPE_CIVFEMALE || nearPed->m_nPedType == PEDTYPE_CIVMALE
+					|| nearPed->m_nPedType == PEDTYPE_CRIMINAL || nearPed->m_nPedType == PEDTYPE_UNUSED1
+					|| nearPed->m_nPedType == PEDTYPE_PROSTITUTE)
+					&& nearPed->CharCreatedBy != MISSION_CHAR
+					&& nearPed->IsPedShootable()
+					&& nearPed->m_objective != OBJECTIVE_MUG_CHAR) {
+					charToMug = nearPed;
+					break;
 				}
 			}
-			break;
+			if (charToMug)
+				SetObjective(OBJECTIVE_MUG_CHAR, charToMug);
 
-		case WAITSTATE_FINISH_FLEE:
-			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_TIRED);
-			if (animAssoc) {
-				if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-					CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 4.0f);
-					int timer = 2000;
-					ClearWaitState();
-					SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, &timer);
-				}
-			} else {
-				ClearWaitState();
-			}
-			break;
-		case WAITSTATE_SIT_DOWN:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				ClearWaitState();
-				SetWaitState(WAITSTATE_SIT_IDLE, 0);
-			}
-			break;
-		//case WAITSTATE_SIT_DOWN_RVRS:
-		case WAITSTATE_SIT_UP:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				if (m_attractor)
-					GetPedAttractorManager()->BroadcastDeparture(this, m_attractor);
-				ClearWaitState();
-				if (bFleeWhenStanding) {
-					if (m_threatEx) {
-						SetFlee(m_threatEx, 10000);
-						bFleeWhenStanding = false;
-						m_threatEx = nil;
-						Say(SOUND_PED_FLEE_SPRINT);
-					}
-				}
-			}
-			break;
-		case WAITSTATE_SIT_IDLE:
-			if (bTurnedAroundOnAttractor) {
-				m_fRotationCur += PI;
-				m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
-				m_fRotationDest = m_fRotationCur;
-				bTurnedAroundOnAttractor = false;
-			}
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				ClearWaitState();
-				SetWaitState(WAITSTATE_SIT_UP, 0);
-			} else {
-				if (m_fleeFrom && m_fleeFrom->IsVehicle()) {
-					m_pNextPathNode = nil;
-					m_threatEx = m_threatEntity;
-					bFleeWhenStanding = true;
-					ClearWaitState();
-					SetWaitState(WAITSTATE_SIT_UP, 0);
-				} else {
-					uint32 threatFlag = ScanForThreats();
-					if (threatFlag == PED_FLAG_GUN || threatFlag == PED_FLAG_EXPLOSION || threatFlag == PED_FLAG_DEADPEDS) {
-						m_pNextPathNode = nil;
-						m_threatEx = m_threatEntity;
-						bFleeWhenStanding = true;
-						ClearWaitState();
-						SetWaitState(WAITSTATE_SIT_UP, 0);
-					}
-				}
-			}
-			break;
-		case WAITSTATE_USE_ATM:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				if (m_attractor)
-					GetPedAttractorManager()->BroadcastDeparture(this, m_attractor);
-				ClearWaitState();
-			}
-			break;
-		case WAITSTATE_SUN_BATHE_IDLE:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer && bCanGiveUpSunbathing) {
-				m_pNextPathNode = nil;
-				bGotUpOfMyOwnAccord = true;
-				SetGetUp();
-				ClearWaitState();
+			m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 5000;
+		}
+	}
 
-			} else if (CWeather::Rain <= 0.1f) {
-				if (CClock::GetHours() <= 18 || CGeneral::GetRandomNumberInRange(0.f, 1.0f) < 0.005f) {
-					uint32 threatFlag = ScanForThreats();
-					if (threatFlag == PED_FLAG_GUN || threatFlag == PED_FLAG_EXPLOSION || threatFlag == PED_FLAG_DEADPEDS) {
-						// Get up in case of danger
-						m_pNextPathNode = nil;
-						m_threatEx = m_threatEntity;
-						bFleeWhenStanding = true;
-						SetGetUp();
-						ClearWaitState();
-					}
-					CPlayerPed *player = FindPlayerPed();
-					if (player) {
-						// Get up if player coming towards us with a car
-						if (player->InVehicle()){
-							CVector vehSpeedPerSec = player->m_pMyVehicle->m_vecMoveSpeed * GAME_SPEED_TO_METERS_PER_SECOND;
-							CVector vehPos = player->m_pMyVehicle->GetPosition();
-							CVector ourPos = GetPosition();
-							float timeUntilVehReachPed = DotProduct(ourPos - vehPos, vehSpeedPerSec) / vehSpeedPerSec.MagnitudeSqr();
-							if (timeUntilVehReachPed > 0.0 && timeUntilVehReachPed < 8.0f) {
-								if ((ourPos - (timeUntilVehReachPed * vehSpeedPerSec + vehPos)).Magnitude() < 5.0f) {
-									m_pNextPathNode = nil;
-									m_threatEx = player;
-									bFleeWhenStanding = true;
-									SetGetUp();
-									ClearWaitState();
-								}
-							}
-						}
-					}
-				} else {
-					m_pNextPathNode = nil;
-					bGotUpOfMyOwnAccord = true;
-					SetGetUp();
-					ClearWaitState();
-				}
-			} else {
-				m_pNextPathNode = nil;
-				bGotUpOfMyOwnAccord = true;
-				SetGetUp();
-				ClearWaitState();
-			}
-			break;
-		case WAITSTATE_RIOT:
-			if (m_nPedState == PED_FLEE_ENTITY || m_nPedState == PED_ATTACK) {
-				ClearWaitState();
-				break;
-			}
+	if (m_nPedState == PED_WANDER_PATH) {
+		if (CGeneral::GetRandomNumberInRange(0.0f, 1.0f) < 0.5f) {
+			if (CTimer::GetTimeInMilliseconds() > m_standardTimer) {
+				for (int i = 0; i < m_numNearPeds; i ++) {
+					if (m_nearPeds[i] && m_nearPeds[i]->m_nPedState == PED_WANDER_PATH) {
+						if ((GetPosition() - m_nearPeds[i]->GetPosition()).Magnitude() < 1.8f
+							&& CanSeeEntity(m_nearPeds[i])
+							&& m_nearPeds[i]->CanSeeEntity(this)
+							&& WillChat(m_nearPeds[i])) {
 
-			PlayRandomAnimationsFromAnimBlock(this, ASSOCGRP_RIOT, ANIM_RIOT_ANGRY, ANIM_RIOT_FUKU - ANIM_RIOT_ANGRY + 1);
-			if (IsPedInControl() && CGeneral::GetRandomNumberInRange(0.f,1.f) < 0.25f
-				&& CPopulation::CanJeerAtStripper(m_modelIndex)) {
-				for (int i = 0; i < m_numNearPeds; ++i) {
-					CPed *nearPed = m_nearPeds[i];
-					if (nearPed) {
-						if ((GetPosition() - nearPed->GetPosition()).MagnitudeSqr() < sq(10.f)) {
-							for (int anim = ANIM_STRIP_A; anim <= ANIM_STRIP_G; anim++) {
-								if (RpAnimBlendClumpGetAssociation(nearPed->GetClump(), anim))
-									Say(SOUND_PED_149);
-							}
+							int time = CGeneral::GetRandomNumber() % 4000 + 10000;
+							SetChat(m_nearPeds[i], time);
+							m_nearPeds[i]->SetChat(this, time);
 						}
 					}
 				}
 			}
-			break;
-		case WAITSTATE_BOMBER:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer)
-				ClearWaitState();
-			break;
-		case WAITSTATE_STRIPPER:
-			PlayRandomAnimationsFromAnimBlock(this, ASSOCGRP_STRIP, ANIM_STRIP_A, ANIM_STRIP_G - ANIM_STRIP_A + 1);
-			break;
-		case WAITSTATE_PLAYANIM_HANDSUP_SIMPLE:
-			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer)
-				ClearWaitState();
-			break;
-		default:
-			break;
+		} else {
+			m_standardTimer = CTimer::GetTimeInMilliseconds() + 200;
+		}
 	}
-
-	if(!m_nWaitState)
-		RestoreHeadingRate();
 }
 
 // --MIAMI: Done
 bool
-CPed::Seek(void)
+CPed::WillChat(CPed *stranger)
 {
-	float distanceToCountItDone = m_distanceToCountSeekDone;
-	eMoveState nextMove = PEDMOVE_NONE;
-
-	if (m_objective != OBJECTIVE_ENTER_CAR_AS_DRIVER) {
-
-		if (m_nPedState != PED_EXIT_TRAIN && m_nPedState != PED_ENTER_TRAIN && m_nPedState != PED_SEEK_IN_BOAT &&
-			m_objective != OBJECTIVE_ENTER_CAR_AS_PASSENGER && m_objective != OBJECTIVE_SOLICIT_VEHICLE && !bDuckAndCover) {
-			
-			if ((!m_pedInObjective || !m_pedInObjective->bInVehicle)
-				&& (CTimer::GetFrameCounter() + m_randomSeed + 60) % 32 == 0) {
-
-				CEntity *obstacle = CWorld::TestSphereAgainstWorld(m_vecSeekPos, 0.4f, nil,
-									false, true, false, false, false, false);
-
-				if (obstacle) {
-					if (!obstacle->IsVehicle() || ((CVehicle*)obstacle)->IsCar()) {
-						distanceToCountItDone = 2.5f;
-					} else {
-						CVehicleModelInfo *vehModel = (CVehicleModelInfo *)CModelInfo::GetModelInfo(obstacle->GetModelIndex());
-						float yLength = vehModel->GetColModel()->boundingBox.max.y
-										- vehModel->GetColModel()->boundingBox.min.y;
-						distanceToCountItDone = yLength * 0.55f;
-					}
-				}
-			}
+	if (m_pNextPathNode && m_pLastPathNode) {
+		if (m_pNextPathNode != m_pLastPathNode && ThePaths.TestCrossesRoad(m_pNextPathNode, m_pLastPathNode)) {
+			return false;
 		}
 	}
-
-	if (!m_pSeekTarget && m_nPedState == PED_SEEK_ENTITY)
-		ClearSeek();
-
-	if (m_objective == OBJECTIVE_FOLLOW_CHAR_IN_FORMATION && !m_pedInObjective) {
-		m_objective = OBJECTIVE_NONE;
-		ClearObjective();
-		SetWanderPath(0);
+	if (m_nSurfaceTouched == SURFACE_TARMAC)
 		return false;
-	}
-
-	float seekPosDist = (m_vecSeekPos - GetPosition()).Magnitude2D();
-	if (seekPosDist < 2.0f || m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT) {
-
-		if (m_objective == OBJECTIVE_FOLLOW_CHAR_IN_FORMATION) {
-
-			if (m_pedInObjective->m_nMoveState != PEDMOVE_STILL)
-				nextMove = m_pedInObjective->m_nMoveState;
-		} else
-			nextMove = PEDMOVE_WALK;
-
-	} else if (m_objective != OBJECTIVE_FOLLOW_CHAR_IN_FORMATION) {
-
-		if (m_objective == OBJECTIVE_SPRINT_TO_AREA)
-			nextMove = PEDMOVE_SPRINT;
-		else if (m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS || m_objective == OBJECTIVE_RUN_TO_AREA || bIsRunning)
-			nextMove = PEDMOVE_RUN;
-		else
-			nextMove = PEDMOVE_WALK;
-
-	} else if (seekPosDist <= 2.0f) {
-
-		if (m_pedInObjective->m_nMoveState != PEDMOVE_STILL)
-			nextMove = m_pedInObjective->m_nMoveState;
-
-	} else {
-		nextMove = PEDMOVE_RUN;
-	}
-
-	if (m_nPedState == PED_SEEK_ENTITY) {
-		if (m_pSeekTarget->IsPed()) {
-			if (((CPed*)m_pSeekTarget)->bInVehicle)
-				distanceToCountItDone += 2.0f;
-		}
-	}
-
-	CVector *nextNode = SeekFollowingPath();
-
-	if (nextNode || seekPosDist >= distanceToCountItDone) {
-		if (bIsRunning && nextMove != PEDMOVE_SPRINT)
-			nextMove = PEDMOVE_RUN;
-
-		if (CTimer::GetTimeInMilliseconds() <= m_nPedStateTimer) {
-
-			if (m_actionX != 0.0f && m_actionY != 0.0f) {
-
-				m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
-					m_actionX, m_actionY,
-					GetPosition().x, GetPosition().y);
-
-				float neededTurn = Abs(m_fRotationDest - m_fRotationCur);
-
-				if (neededTurn > PI)
-					neededTurn = TWOPI - neededTurn;
-
-				if (neededTurn > HALFPI) {
-					if (seekPosDist >= 1.0f) {
-						if (seekPosDist < 2.0f) {
-							if (bIsRunning)
-								nextMove = PEDMOVE_RUN;
-							else
-								nextMove = PEDMOVE_WALK;
-						}
-					} else {
-						nextMove = PEDMOVE_STILL;
-					}
-				}
-
-				CVector2D moveDist(GetPosition().x - m_actionX, GetPosition().y - m_actionY);
-				if (moveDist.Magnitude() < 0.5f) {
-					m_nPedStateTimer = 0;
-					m_actionX = 0.f;
-					m_actionY = 0.f;
-				}
-			}
-
-		} else {
-			if (nextNode) {
-				m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
-					nextNode->x, nextNode->y,
-					GetPosition().x, GetPosition().y);
-			} else {
-				m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
-					m_vecSeekPos.x, m_vecSeekPos.y,
-					GetPosition().x, GetPosition().y);
-			}
-
-			float neededTurn = Abs(m_fRotationDest - m_fRotationCur);
-
-			if (neededTurn > PI)
-				neededTurn = TWOPI - neededTurn;
-
-			if (neededTurn > HALFPI) {
-				if (seekPosDist >= 1.0f && neededTurn <= DEGTORAD(135.0f)) {
-					if (seekPosDist < 2.0f)
-						nextMove = PEDMOVE_WALK;
-				} else {
-					nextMove = PEDMOVE_STILL;
-				}
-			}
-		}
-
-		if (((m_nPedState == PED_FLEE_POS || m_nPedState == PED_FLEE_ENTITY) && m_nMoveState < nextMove)
-			|| (m_nPedState != PED_FLEE_POS && m_nPedState != PED_FLEE_ENTITY && m_nPedState != PED_FOLLOW_PATH && m_objective != OBJECTIVE_GOTO_CHAR_ON_FOOT && m_nWaitState == WAITSTATE_FALSE)) {
-
-			SetMoveState(nextMove);
-		}
-		
-		SetMoveAnim();
+	if (stranger == this)
+		return false;
+	if (m_nPedType == stranger->m_nPedType)
+		return true;
+	if (m_nPedType == PEDTYPE_CRIMINAL)
+		return false;
+	if (stranger->m_nPedType == PEDTYPE_COP)
+		return false;
+	if (stranger->IsPlayer())
+		return false;
+	if ((IsGangMember() || stranger->IsGangMember()) && m_nPedType != stranger->m_nPedType)
 		return false;
-	}
-
-	if ((m_objective != OBJECTIVE_FOLLOW_CHAR_IN_FORMATION || m_pedInObjective->m_nMoveState == PEDMOVE_STILL) && m_nMoveState != PEDMOVE_STILL) {
-		m_nPedStateTimer = 0;
-		m_actionX = 0.f;
-		m_actionY = 0.f;
-	}
-
-	if (m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA || m_objective == OBJECTIVE_SPRINT_TO_AREA ||
-		m_objective == OBJECTIVE_GOTO_AREA_ANY_MEANS || IsUseAttractorObjective(m_objective)) {
-
-		if (m_pNextPathNode)
-			m_pNextPathNode = nil;
-		else
-			bScriptObjectiveCompleted = true;
-
-		bUsePedNodeSeek = true;
-	}
-
 	return true;
 }
 
 // --MIAMI: Done
-CVector*
-CPed::SeekFollowingPath(void)
-{
-	static CVector vecNextPathNode;
-
-	if (m_nCurPathNodeId >= m_nNumPathNodes || m_nNumPathNodes == 0)
-		return nil;
-
-	vecNextPathNode = m_pathNodesToGo[m_nCurPathNodeId]->GetPosition();
-
-	if ((vecNextPathNode - GetPosition()).Magnitude2D() < m_distanceToCountSeekDone) {
-		m_nCurPathNodeId++;
-		if (m_nCurPathNodeId < m_nNumPathNodes)
-			m_pCurPathNode = m_pathNodesToGo[m_nCurPathNodeId];
-	}
-	if (m_nCurPathNodeId == m_nNumPathNodes)
-		return nil;
-	else
-		return &vecNextPathNode;
-}
-
-// --MIAMI: Done
 void
-CPed::Flee(void)
+CPed::CalculateNewVelocity(void)
 {
-	if (CTimer::GetTimeInMilliseconds() > m_fleeTimer && m_fleeTimer) {
-		bool mayFinishFleeing = true;
-		if (m_nPedState == PED_FLEE_ENTITY) {
-			if ((CVector2D(GetPosition()) - ms_vec2DFleePosition).MagnitudeSqr() < sq(30.0f))
-				mayFinishFleeing = false;
-		}
-
-		if (mayFinishFleeing) {
-			bMakeFleeScream = false;
-			eMoveState moveState = m_nMoveState;
-			ClearFlee();
-
-			if (m_objective == OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE || m_objective == OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS) {
-				bBeingChasedByPolice = false;
-				RestorePreviousObjective();
-			}
-
-			if ((m_nPedState == PED_IDLE || m_nPedState == PED_WANDER_PATH) && CGeneral::GetRandomNumber() & 1) {
-				SetWaitState(moveState <= PEDMOVE_WALK ? WAITSTATE_CROSS_ROAD_LOOK : WAITSTATE_FINISH_FLEE, nil);
-			}
-			return;
-		}
-		m_fleeTimer = CTimer::GetTimeInMilliseconds() + 5000;
-	}
-
-	if (bMakeFleeScream && !((CTimer::GetFrameCounter() + m_randomSeed) & 7)) {
-		Say(SOUND_PED_FLEE_SPRINT);
-		bMakeFleeScream = false;
-	}
-
-	if (bUsePedNodeSeek) {
-		CPathNode *realLastNode = nil;
-		uint8 nextDirection = 0;
-		uint8 curDirectionShouldBe = 9; // means not defined yet
-
-		if (m_nPedStateTimer < CTimer::GetTimeInMilliseconds()
-			&& m_collidingThingTimer < CTimer::GetTimeInMilliseconds()) {
-
-			if (m_pNextPathNode && CTimer::GetTimeInMilliseconds() > m_standardTimer)  {
-
-				curDirectionShouldBe = CGeneral::GetNodeHeadingFromVector(GetPosition().x - ms_vec2DFleePosition.x, GetPosition().y - ms_vec2DFleePosition.y);
-				if (m_nPathDir < curDirectionShouldBe)
-					m_nPathDir += 8;
-
-				int dirDiff = m_nPathDir - curDirectionShouldBe;
-				if (dirDiff > 2 && dirDiff < 6) {
-					realLastNode = nil;
-					m_pLastPathNode = m_pNextPathNode;
-					m_pNextPathNode = nil;
-				}
-			}
-
-			if (m_pNextPathNode) {
-				m_vecSeekPos = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
-				if (m_nMoveState == PEDMOVE_RUN)
-					bIsRunning = true;
-
-				eMoveState moveState = m_nMoveState;
-				if (Seek()) {
-					realLastNode = m_pLastPathNode;
-					m_pLastPathNode = m_pNextPathNode;
-					m_pNextPathNode = nil;
-				}
-				bIsRunning = false;
-				SetMoveState(moveState);
-			}
-		}
-
-		if (!m_pNextPathNode) {
-			if (curDirectionShouldBe == 9) {
-				curDirectionShouldBe = CGeneral::GetNodeHeadingFromVector(GetPosition().x - ms_vec2DFleePosition.x, GetPosition().y - ms_vec2DFleePosition.y);
-			}
-			ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode,
-				curDirectionShouldBe,
-				&nextDirection);
-
-			if (curDirectionShouldBe < nextDirection)
-				curDirectionShouldBe += 8;
-			
-			if (m_pNextPathNode && m_pNextPathNode != realLastNode && m_pNextPathNode != m_pLastPathNode && curDirectionShouldBe - nextDirection != 4) {
-				m_nPathDir = nextDirection;
-				m_standardTimer = CTimer::GetTimeInMilliseconds() + 2000;
-			} else {
-				bUsePedNodeSeek = false;
-				SetMoveState(PEDMOVE_RUN);
-				Flee();
-			}
-		}
-		return;
-	}
-
-	if ((m_nPedState == PED_FLEE_ENTITY || m_nPedState == PED_ON_FIRE) && m_nPedStateTimer < CTimer::GetTimeInMilliseconds()) {
-
-		float angleToFleeFromPos = CGeneral::GetRadianAngleBetweenPoints(
-			GetPosition().x,
-			GetPosition().y,
-			ms_vec2DFleePosition.x,
-			ms_vec2DFleePosition.y);
-
-		m_fRotationDest = CGeneral::LimitRadianAngle(angleToFleeFromPos);
-
-		if (m_fRotationCur - PI > m_fRotationDest)
-			m_fRotationDest += TWOPI;
-		else if (PI + m_fRotationCur < m_fRotationDest)
-			m_fRotationDest -= TWOPI;
-	}
-
-	if (CTimer::GetTimeInMilliseconds() >= m_collidingThingTimer)
-		return;
-
-	if (!m_collidingEntityWhileFleeing)
-		return;
-
-	double collidingThingPriorityMult = (double)(m_collidingThingTimer - CTimer::GetTimeInMilliseconds()) * 2.0 / 2500;
-
-	if (collidingThingPriorityMult <= 1.5) {
-		double angleToFleeEntity = CGeneral::GetRadianAngleBetweenPoints(
-			GetPosition().x,
-			GetPosition().y,
-			m_collidingEntityWhileFleeing->GetPosition().x,
-			m_collidingEntityWhileFleeing->GetPosition().y);
-		angleToFleeEntity = CGeneral::LimitRadianAngle(angleToFleeEntity);
-
-		double angleToFleeCollidingThing = CGeneral::GetRadianAngleBetweenPoints(
-			m_vecDamageNormal.x,
-			m_vecDamageNormal.y,
-			0.0f,
-			0.0f);
-		angleToFleeCollidingThing = CGeneral::LimitRadianAngle(angleToFleeCollidingThing);
-
-		if (angleToFleeEntity - PI > angleToFleeCollidingThing)
-			angleToFleeCollidingThing += TWOPI;
-		else if (PI + angleToFleeEntity < angleToFleeCollidingThing)
-			angleToFleeCollidingThing -= TWOPI;
-
-		if (collidingThingPriorityMult <= 1.0f) {
-			// Range [0.0, 1.0]
-
-			float angleToFleeBoth = (angleToFleeCollidingThing + angleToFleeEntity) * 0.5f;
-
-			if (m_fRotationDest - PI > angleToFleeBoth)
-				angleToFleeBoth += TWOPI;
-			else if (PI + m_fRotationDest < angleToFleeBoth)
-				angleToFleeBoth -= TWOPI;
-	
-			m_fRotationDest = (1.0f - collidingThingPriorityMult) * m_fRotationDest + collidingThingPriorityMult * angleToFleeBoth;
-		} else {
-			// Range (1.0, 1.5]
+	if (IsPedInControl()) {
+		float headAmount = DEGTORAD(m_headingRate) * CTimer::GetTimeStep();
+		m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
+		float limitedRotDest = CGeneral::LimitRadianAngle(m_fRotationDest);
 
-			double adjustedMult = (collidingThingPriorityMult - 1.0f) * 2.0f;
-			m_fRotationDest = angleToFleeEntity * (1.0 - adjustedMult) + adjustedMult * angleToFleeCollidingThing;
+		if (m_fRotationCur - PI > limitedRotDest) {
+				limitedRotDest += 2 * PI;
+		} else if(PI + m_fRotationCur < limitedRotDest) {
+			limitedRotDest -= 2 * PI;
 		}
-	} else {
-		m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
-			m_vecDamageNormal.x,
-			m_vecDamageNormal.y,
-			0.0f,
-			0.0f);
-		m_fRotationDest = CGeneral::LimitRadianAngle(m_fRotationDest);
-	}
-
-	m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
-
-	if (m_fRotationCur - PI > m_fRotationDest)
-		m_fRotationDest += TWOPI;
-	else if (PI + m_fRotationCur < m_fRotationDest)
-		m_fRotationDest -= TWOPI;
-
-}
-
-// --MIAMI: Done
-void
-CPed::FollowPath(void)
-{
-	m_pCurPathNode = m_pathNodesToGo[m_nCurPathNodeId];
-	if (m_pathNodeTimer > 0 && CTimer::GetTimeInMilliseconds() > m_pathNodeTimer) {
-		RestorePreviousState();
-		ClearFollowPath();
-		m_pathNodeTimer = 0;
-	} else {
-		if (m_pathNodesToGo[m_nCurPathNodeId]) {
-			m_vecSeekPos.x = m_pathNodesToGo[m_nCurPathNodeId]->GetPosition().x;
-			m_vecSeekPos.y = m_pathNodesToGo[m_nCurPathNodeId]->GetPosition().y;
-			m_vecSeekPos.z = GetPosition().z;
 
-			if (Seek()) {
-				if (m_nCurPathNodeId == m_nNumPathNodes) {
-					RestorePreviousState();
-					ClearFollowPath();
-					SetFollowPath(m_followPathDestPos, m_followPathAbortDist, m_followPathMoveState, m_followPathWalkAroundEnt,
-						m_followPathTargetEnt, m_pathNodeTimer - CTimer::GetTimeInMilliseconds());
-				}
-			}
+		float neededTurn = limitedRotDest - m_fRotationCur;
+		if (neededTurn <= headAmount) {
+			if (neededTurn > (-headAmount))
+				m_fRotationCur += neededTurn;
+			else
+				m_fRotationCur -= headAmount;
 		} else {
-			RestorePreviousState();
-			ClearFollowPath();
-			m_pathNodeTimer = 0;
-		}
-	}
-}
-
-// --MIAMI: Done
-CVector
-CPed::GetFormationPosition(void)
-{
-	if (!m_pedInObjective)
-		return GetPosition();
-
-	if (m_pedInObjective->m_nPedState == PED_DEAD) {
-		if (!m_pedInObjective->m_pedInObjective) {
-			m_pedInObjective = nil;
-			return GetPosition();
-		}
-		m_pedInObjective = m_pedInObjective->m_pedInObjective;
-	}
-
-	CVector formationOffset;
-	float offset = CGeneral::GetRandomNumberInRange(1.f, 1.25f) * 1.75f;
-	switch (m_pedFormation) {
-		case FORMATION_REAR:
-			formationOffset = CVector(0.0f, -offset, 0.0f);
-			break;
-		case FORMATION_REAR_LEFT:
-			formationOffset = CVector(-offset, -offset, 0.0f);
-			break;
-		case FORMATION_REAR_RIGHT:
-			formationOffset = CVector(offset, -offset, 0.0f);
-			break;
-		case FORMATION_FRONT_LEFT:
-			formationOffset = CVector(-offset, offset, 0.0f);
-			break;
-		case FORMATION_FRONT_RIGHT:
-			formationOffset = CVector(offset, offset, 0.0f);
-			break;
-		case FORMATION_LEFT:
-			formationOffset = CVector(-offset, 0.0f, 0.0f);
-			break;
-		case FORMATION_RIGHT:
-			formationOffset = CVector(offset, 0.0f, 0.0f);
-			break;
-		case FORMATION_FRONT:
-			formationOffset = CVector(0.0f, offset, 0.0f);
-			break;
-		default:
-			formationOffset = CVector(0.0f, 0.0f, 0.0f);
-			break;
-	}
-	return m_pedInObjective->GetMatrix() * formationOffset;
-}
-
-// --MIAMI: Done
-void
-CPed::GetNearestDoor(CVehicle *veh, CVector &posToOpen)
-{
-	CVector *enterOffset = nil;
-	if (veh->IsBike()) {
-		if (m_objective != OBJECTIVE_ENTER_CAR_AS_PASSENGER) {
-
-			// If bike didn't fall to ground
-			if (Abs(veh->GetRight().z) < 0.1f) {
-				float angleDiff = (GetPosition() - veh->GetPosition()).Heading() - veh->GetForward().Heading();
-
-				if (angleDiff > PI)
-					angleDiff -= TWOPI;
-				else if (angleDiff < -PI)
-					angleDiff += TWOPI;
-
-				if (Abs(angleDiff) < DEGTORAD(30.f)
-					&& (IsPlayer() && ((CPlayerPed*)this)->m_fMoveSpeed > 1.5f && !m_vehEnterType ||
-						!IsPlayer() && m_nPedType != PEDTYPE_COP && m_nMoveState == PEDMOVE_RUN
-						&& m_pedStats->m_temper > 65
-						&& !m_vehEnterType || m_vehEnterType == CAR_WINDSCREEN)) {
-					m_vehEnterType = CAR_WINDSCREEN;
-					posToOpen = GetPositionToOpenCarDoor(veh, CAR_WINDSCREEN);
-					return;
-				}
-			}
+			m_fRotationCur += headAmount;
 		}
-	} else if (m_vehEnterType == CAR_DOOR_LF && veh->pDriver && !veh->bLowVehicle && !veh->bIsBus) {
-		enterOffset = &vecPedQuickDraggedOutCarAnimOffset;
 	}
 
-	CVector lfPos = GetPositionToOpenCarDoor(veh, CAR_DOOR_LF);
-	CVector rfPos = GetPositionToOpenCarDoor(veh, CAR_DOOR_RF);
+	CVector2D forward(Sin(m_fRotationCur), Cos(m_fRotationCur));
 
-	// Left front door is closer
-	if ((lfPos - GetPosition()).MagnitudeSqr2D() < (rfPos - GetPosition()).MagnitudeSqr2D()) {
+	m_moved.x = CrossProduct2D(m_vecAnimMoveDelta, forward); // (m_vecAnimMoveDelta.x * Cos(m_fRotationCur)) + -Sin(m_fRotationCur) * m_vecAnimMoveDelta.y;
+	m_moved.y = DotProduct2D(m_vecAnimMoveDelta, forward);  // m_vecAnimMoveDelta.y* Cos(m_fRotationCur) + (m_vecAnimMoveDelta.x * Sin(m_fRotationCur));
 
-		if (veh->IsRoomForPedToLeaveCar(CAR_DOOR_LF, enterOffset)) {
-			m_vehEnterType = CAR_DOOR_LF;
-			posToOpen = lfPos;
-		} else if (veh->IsRoomForPedToLeaveCar(CAR_DOOR_RF, enterOffset)) {
-			m_vehEnterType = CAR_DOOR_RF;
-			posToOpen = rfPos;
-		}
+	if (CTimer::GetTimeStep() >= 0.01f) {
+		m_moved = m_moved * (1 / CTimer::GetTimeStep());
 	} else {
-
-		if (veh->IsRoomForPedToLeaveCar(CAR_DOOR_RF, enterOffset)) {
-
-			CPed *rfPassenger = veh->pPassengers[0];
-			if (rfPassenger && !veh->IsBike()
-					&& (rfPassenger->m_leader == this || rfPassenger->bDontDragMeOutCar ||
-						veh->VehicleCreatedBy == MISSION_VEHICLE && m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER)
-					&& veh->IsRoomForPedToLeaveCar(CAR_DOOR_LF, enterOffset)
-				|| (veh->m_nGettingInFlags & CAR_DOOR_FLAG_RF) && veh->IsRoomForPedToLeaveCar(CAR_DOOR_LF, enterOffset)) {
-
-				m_vehEnterType = CAR_DOOR_LF;
-				posToOpen = lfPos;
-			} else {
-				m_vehEnterType = CAR_DOOR_RF;
-				posToOpen = rfPos;
-			}
-		} else if (veh->IsRoomForPedToLeaveCar(CAR_DOOR_LF, enterOffset)) {
-			m_vehEnterType = CAR_DOOR_LF;
-			posToOpen = lfPos;
-		}
-	}
-}
-
-// --MIAMI: Done
-bool
-CPed::GetNearestPassengerDoor(CVehicle *veh, CVector &posToOpen)
-{
-	CVector rfPos, lrPos, rrPos;
-	bool canEnter = false;
-
-	CVehicleModelInfo *vehModel = (CVehicleModelInfo *)CModelInfo::GetModelInfo(veh->GetModelIndex());
-
-	switch (veh->GetModelIndex()) {
-		case MI_BUS:
-			m_vehEnterType = CAR_DOOR_RF;
-			posToOpen = GetPositionToOpenCarDoor(veh, CAR_DOOR_RF);
-			return true;
-		case MI_RHINO:
-		default:
-			break;
-	}
-
-	CVector2D rfPosDist(999.0f, 999.0f);
-	CVector2D lrPosDist(999.0f, 999.0f);
-	CVector2D rrPosDist(999.0f, 999.0f);
-
-	if (veh->IsBike()) {
-		if (!veh->pPassengers[0]
-			&& !(veh->m_nGettingInFlags & CAR_DOOR_FLAG_LR)
-			&& veh->IsRoomForPedToLeaveCar(CAR_DOOR_LR, nil)) {
-			lrPos = GetPositionToOpenCarDoor(veh, CAR_DOOR_LR);
-			canEnter = true;
-			lrPosDist = lrPos - GetPosition();
-		}
-		if (!veh->pPassengers[0]
-			&& !(veh->m_nGettingInFlags & CAR_DOOR_FLAG_RR)
-			&& veh->IsRoomForPedToLeaveCar(CAR_DOOR_RR, nil)) {
-			rrPos = GetPositionToOpenCarDoor(veh, CAR_DOOR_RR);
-			canEnter = true;
-			rrPosDist = rrPos - GetPosition();
-		}
-	} else if (!veh->pPassengers[0]
-		&& !(veh->m_nGettingInFlags & CAR_DOOR_FLAG_RF)
-		&& veh->IsRoomForPedToLeaveCar(CAR_DOOR_RF, nil)) {
-
-		rfPos = GetPositionToOpenCarDoor(veh, CAR_DOOR_RF);
-		canEnter = true;
-		rfPosDist = rfPos - GetPosition();
-	}
-
-	if (vehModel->m_numDoors == 4) {
-		if (!veh->pPassengers[1]
-			&& !(veh->m_nGettingInFlags & CAR_DOOR_FLAG_LR)
-			&& veh->IsRoomForPedToLeaveCar(CAR_DOOR_LR, nil)) {
-			lrPos = GetPositionToOpenCarDoor(veh, CAR_DOOR_LR);
-			canEnter = true;
-			lrPosDist = lrPos - GetPosition();
-		}
-		if (!veh->pPassengers[2]
-			&& !(veh->m_nGettingInFlags & CAR_DOOR_FLAG_RR)
-			&& veh->IsRoomForPedToLeaveCar(CAR_DOOR_RR, nil)) {
-			rrPos = GetPositionToOpenCarDoor(veh, CAR_DOOR_RR);
-			canEnter = true;
-			rrPosDist = rrPos - GetPosition();
-		}
-
-		// When the door we should enter is blocked by some object.
-		if (!canEnter)
-			veh->ShufflePassengersToMakeSpace();
+		m_moved = m_moved * (1 / 100.0f);
 	}
 
-	CVector2D nextToCompare = rfPosDist;
-	posToOpen = rfPos;
-	m_vehEnterType = CAR_DOOR_RF;
-	if (lrPosDist.MagnitudeSqr() < nextToCompare.MagnitudeSqr()) {
-		m_vehEnterType = CAR_DOOR_LR;
-		posToOpen = lrPos;
-		nextToCompare = lrPosDist;
-	}
+	if ((!TheCamera.Cams[TheCamera.ActiveCam].GetWeaponFirstPersonOn() && !TheCamera.Cams[0].Using3rdPersonMouseCam())
+		|| FindPlayerPed() != this || !CanStrafeOrMouseControl()) {
 
-	if (rrPosDist.MagnitudeSqr() < nextToCompare.MagnitudeSqr()) {
-		m_vehEnterType = CAR_DOOR_RR;
-		posToOpen = rrPos;
+		if (FindPlayerPed() == this)
+			FindPlayerPed()->m_fWalkAngle = 0.0f;
+		return;
 	}
-	return canEnter;
-}
 
-// --MIAMI: Done
-int
-CPed::GetNextPointOnRoute(void)
-{
-	int16 nextPoint = m_routePointsBeingPassed + m_routePointsPassed + m_routeStartPoint;
-
-	// Route is complete
-	if (nextPoint < 0 || nextPoint > NUMPEDROUTES || m_routeLastPoint != CRouteNode::GetRouteThisPointIsOn(nextPoint)) {
+	float walkAngle = WorkOutHeadingForMovingFirstPerson(m_fRotationCur);
+	float pedSpeed = m_moved.Magnitude();
+	float localWalkAngle = CGeneral::LimitRadianAngle(walkAngle - m_fRotationCur);
 
-		switch (m_routeType) {
-			case PEDROUTE_STOP_WHEN_DONE:
-				nextPoint = -1;
-				break;
-			case PEDROUTE_GO_BACKWARD_WHEN_DONE:
-				m_routePointsBeingPassed = -m_routePointsBeingPassed;
-				nextPoint = m_routePointsBeingPassed + m_routePointsPassed + m_routeStartPoint;
-				break;
-			case PEDROUTE_GO_TO_START_WHEN_DONE:
-				m_routePointsPassed = -1;
-				nextPoint = m_routePointsBeingPassed + m_routePointsPassed + m_routeStartPoint;
-				break;
-			default:
-				break;
-		}
+	if (localWalkAngle < -0.5f * PI) {
+		localWalkAngle += PI;
+	} else if (localWalkAngle > 0.5f * PI) {
+		localWalkAngle -= PI;
 	}
-	return nextPoint;
-}
-
-// --MIAMI: Done
-int
-CPed::GetWeaponSlot(eWeaponType weaponType)
-{
-	return CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot;
-}
-
-// --MIAMI: Done
-bool
-CPed::CanWeRunAndFireWithWeapon(void)
-{
-	return CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_bCanAimWithArm;
-}
-
-// --MIAMI: Done
-void
-CPed::GoToNearestDoor(CVehicle *veh)
-{
-	CVector posToOpen;
-	GetNearestDoor(veh, posToOpen);
-	SetSeek(posToOpen, 0.5f);
-	SetMoveState(PEDMOVE_RUN);
-}
 
-// --MIAMI: Done
-bool
-CPed::HaveReachedNextPointOnRoute(float distToCountReached)
-{
-	if ((m_nextRoutePointPos - GetPosition()).Magnitude2D() < distToCountReached) {
-		m_routePointsPassed += m_routePointsBeingPassed;
-		return true;
+	// Interestingly this part is responsible for diagonal walking.
+	if (localWalkAngle > -DEGTORAD(50.0f) && localWalkAngle < DEGTORAD(50.0f)) {
+		TheCamera.Cams[TheCamera.ActiveCam].m_fPlayerVelocity = pedSpeed;
+		m_moved = CVector2D(-Sin(walkAngle), Cos(walkAngle)) * pedSpeed;
 	}
-	return false;
-}
 
-// --MIAMI: Done
-void
-CPed::Idle(void)
-{
-	CVehicle *veh = m_pMyVehicle;
-	if (veh && veh->m_nGettingOutFlags && m_vehEnterType) {
-
-		if (veh->m_nGettingOutFlags & GetCarDoorFlag(m_vehEnterType)) {
+	CAnimBlendAssociation *idleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE);
+	CAnimBlendAssociation *fightAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FIGHT_IDLE);
+	if(!fightAssoc)
+		fightAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_TIRED);
 
-			if (m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT) {
+	if(!fightAssoc)
+		fightAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCHRELOAD);
 
-				CVector doorPos = GetPositionToOpenCarDoor(veh, m_vehEnterType);
-				CVector doorDist = GetPosition() - doorPos;
+	if ((!idleAssoc || idleAssoc->blendAmount < 0.5f) && !fightAssoc && !bIsDucking) {
+		LimbOrientation newUpperLegs;
+		newUpperLegs.yaw = localWalkAngle;
 
-				if (doorDist.MagnitudeSqr() < sq(0.5f)) {
-					SetMoveState(PEDMOVE_WALK);
-					return;
-				}
-			}
+		if (newUpperLegs.yaw < -DEGTORAD(100.0f)) {
+			newUpperLegs.yaw += PI;
+		} else if (newUpperLegs.yaw > DEGTORAD(100.0f)) {
+			newUpperLegs.yaw -= PI;
 		}
-	}
-
-	if (m_nMoveState != PEDMOVE_STILL && !IsPlayer())
-		SetMoveState(PEDMOVE_STILL);
 
-	m_moved = CVector2D(0.0f, 0.0f);
-}
-
-// --MIAMI: Done
-void
-CPed::InTheAir(void)
-{
-	CColPoint foundCol;
-	CEntity *foundEnt;
-
-	CVector ourPos = GetPosition();
-	CVector bitBelow = GetPosition();
-	bitBelow.z -= 4.04f;
-
-	if (m_vecMoveSpeed.z < 0.0f && !bIsPedDieAnimPlaying) {
-		if (!DyingOrDead()) {
-			if (CWorld::ProcessLineOfSight(ourPos, bitBelow, foundCol, foundEnt, true, true, false, true, false, false, false)) {
-				if (GetPosition().z - foundCol.point.z < 1.3f || bIsStanding)
-					SetLanding();
-			} else if (m_nPedState != PED_ABSEIL && !RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FALL)) {
-				if (m_vecMoveSpeed.z < -0.1f)
-					CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_FALL, 4.0f);
-			}
+		if (newUpperLegs.yaw > -DEGTORAD(50.0f) && newUpperLegs.yaw < DEGTORAD(50.0f)) {
+			newUpperLegs.pitch = 0.1f;
+			RwV3d Xaxis = { 1.0f, 0.0f, 0.0f };
+			RwV3d Zaxis = { 0.0f, 0.0f, 1.0f };
+			RtQuatRotate(&m_pFrames[PED_UPPERLEGL]->hanimFrame->q, &Zaxis, RADTODEG(newUpperLegs.pitch), rwCOMBINEPOSTCONCAT);
+			RtQuatRotate(&m_pFrames[PED_UPPERLEGL]->hanimFrame->q, &Xaxis, RADTODEG(newUpperLegs.yaw), rwCOMBINEPOSTCONCAT);
+			RtQuatRotate(&m_pFrames[PED_UPPERLEGR]->hanimFrame->q, &Zaxis, RADTODEG(newUpperLegs.pitch), rwCOMBINEPOSTCONCAT);
+			RtQuatRotate(&m_pFrames[PED_UPPERLEGR]->hanimFrame->q, &Xaxis, RADTODEG(newUpperLegs.yaw), rwCOMBINEPOSTCONCAT);
+			bDontAcceptIKLookAts = true;
 		}
 	}
 }
 
 // --MIAMI: Done
-void
-CPed::SetLanding(void)
+float
+CPed::WorkOutHeadingForMovingFirstPerson(float offset)
 {
-	if (DyingOrDead())
-		return;
-
-	CAnimBlendAssociation *fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FALL);
-	CAnimBlendAssociation *landAssoc;
-
-	if (fallAssoc && bIsDrowning)
-		return;
-
-	RpAnimBlendClumpSetBlendDeltas(GetClump(), ASSOC_PARTIAL, -1000.0f);
-	if (fallAssoc || m_nPedType == PEDTYPE_COP && bKnockedUpIntoAir) {
-		landAssoc = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_COLLAPSE);
-		DMAudio.PlayOneShot(m_audioEntityId, SOUND_FALL_COLLAPSE, 1.0f);
-
-		if (IsPlayer())
-			Say(SOUND_PED_LAND);
+	if (!IsPlayer())
+		return 0.0f;
 
-		if (m_nPedType == PEDTYPE_COP) {
-			if (bKnockedUpIntoAir)
-				bKnockedUpIntoAir = false;
-		}
+	CPad *pad0 = CPad::GetPad(0);
+	float leftRight = pad0->GetPedWalkLeftRight();
+	float upDown = pad0->GetPedWalkUpDown();
+	float &angle = ((CPlayerPed*)this)->m_fWalkAngle;
 
+	if (upDown != 0.0f) {
+		angle = CGeneral::GetRadianAngleBetweenPoints(0.0f, 0.0f, -leftRight, upDown);
 	} else {
-		landAssoc = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_LAND);
-		DMAudio.PlayOneShot(m_audioEntityId, SOUND_FALL_LAND, 1.0f);
-	}
-
-	landAssoc->SetFinishCallback(PedLandCB, this);
-	bIsInTheAir = false;
-	bIsLanding = true;
-}
-
-// --MIAMI: Done
-void
-CPed::Initialise(void)
-{
-	debug("Initialising CPed...\n");
-	CPedType::Initialise();
-	LoadFightData();
-	SetAnimOffsetForEnterOrExitVehicle();
-	debug("CPed ready\n");
-}
-
-// --MIAMI: Done
-void
-CPed::SetAnimOffsetForEnterOrExitVehicle(void)
-{
-	// FIX_BUGS: If there were no translations on enter anims, there were overflows all over this function.
-
-	int vanBlock = CAnimManager::GetAnimationBlockIndex("van");
-	int bikesBlock = CAnimManager::GetAnimationBlockIndex("bikes");
-	int bikevBlock = CAnimManager::GetAnimationBlockIndex("bikev");
-	int bikehBlock = CAnimManager::GetAnimationBlockIndex("bikeh");
-	int bikedBlock = CAnimManager::GetAnimationBlockIndex("biked");
-	CStreaming::RequestAnim(vanBlock, STREAMFLAGS_DEPENDENCY);
-	CStreaming::RequestAnim(bikesBlock, STREAMFLAGS_DEPENDENCY);
-	CStreaming::RequestAnim(bikevBlock, STREAMFLAGS_DEPENDENCY);
-	CStreaming::RequestAnim(bikehBlock, STREAMFLAGS_DEPENDENCY);
-	CStreaming::RequestAnim(bikedBlock, STREAMFLAGS_DEPENDENCY);
-	CStreaming::LoadAllRequestedModels(false);
-	CAnimManager::AddAnimBlockRef(vanBlock);
-	CAnimManager::AddAnimBlockRef(bikesBlock);
-	CAnimManager::AddAnimBlockRef(bikevBlock);
-	CAnimManager::AddAnimBlockRef(bikehBlock);
-	CAnimManager::AddAnimBlockRef(bikedBlock);
-
-	CAnimBlendHierarchy *enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, ANIM_CAR_JACKED_LHS)->hierarchy;
-	CAnimBlendSequence *seq = enterAssoc->sequences;
-	CAnimManager::UncompressAnimation(enterAssoc);
-	if (seq->numFrames > 0) {
-		if (!seq->HasTranslation())
-			vecPedDraggedOutCarAnimOffset = CVector(0.0f, 0.0f, 0.0f);
-		else {
-			KeyFrameTrans *lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
-			vecPedDraggedOutCarAnimOffset = lastFrame->translation;
-		}
-	}
-
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, ANIM_CAR_GETIN_LHS)->hierarchy;
-	seq = enterAssoc->sequences;
-	CAnimManager::UncompressAnimation(enterAssoc);
-	if (seq->numFrames > 0) {
-		if (!seq->HasTranslation())
-			vecPedCarDoorAnimOffset = CVector(0.0f, 0.0f, 0.0f);
-		else {
-			KeyFrameTrans *lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
-			vecPedCarDoorAnimOffset = lastFrame->translation;
-		}
-	}
-
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_LHS)->hierarchy;
-	seq = enterAssoc->sequences;
-	CAnimManager::UncompressAnimation(enterAssoc);
-	if (seq->numFrames > 0) {
-		if (!seq->HasTranslation())
-			vecPedCarDoorLoAnimOffset = CVector(0.0f, 0.0f, 0.0f);
-		else {
-			KeyFrameTrans *lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
-			vecPedCarDoorLoAnimOffset = lastFrame->translation;
-		}
-	}
-
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, ANIM_CAR_QJACKED)->hierarchy;
-	seq = enterAssoc->sequences;
-	CAnimManager::UncompressAnimation(enterAssoc);
-	if (seq->numFrames > 0) {
-		if (!seq->HasTranslation())
-			vecPedQuickDraggedOutCarAnimOffset = CVector(0.0f, 0.0f, 0.0f);
-		else {
-			KeyFrameTrans *lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
-			vecPedQuickDraggedOutCarAnimOffset = lastFrame->translation;
-		}
-	}
-
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_VAN, ANIM_VAN_GETIN_L)->hierarchy;
-	seq = enterAssoc->sequences;
-	CAnimManager::UncompressAnimation(enterAssoc);
-	if (seq->numFrames > 0) {
-		if (!seq->HasTranslation())
-			vecPedVanRearDoorAnimOffset = CVector(0.0f, 0.0f, 0.0f);
-		else {
-			KeyFrameTrans *lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
-			vecPedVanRearDoorAnimOffset = lastFrame->translation;
-		}
-	}
-	// I think this is leftover and ANIM_TRAIN_GETOUT
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, ANIM_IDLE_STANCE3)->hierarchy;
-	seq = enterAssoc->sequences;
-	CAnimManager::UncompressAnimation(enterAssoc);
-	if (seq->numFrames > 0) {
-		if (!seq->HasTranslation())
-			vecPedTrainDoorAnimOffset = CVector(0.0f, 0.0f, 0.0f);
-		else {
-			KeyFrameTrans *lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
-			vecPedTrainDoorAnimOffset = lastFrame->translation;
-		}
-	}
-
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_BIKE_STANDARD, ANIM_BIKE_JUMPON_R)->hierarchy;
-	seq = enterAssoc->sequences;
-	CAnimManager::UncompressAnimation(enterAssoc);
-	if (seq->numFrames > 0) {
-		if (!seq->HasTranslation())
-			vecPedStdBikeJumpRhsAnimOffset = CVector(0.0f, 0.0f, 0.0f);
-		else {
-			KeyFrameTrans* lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
-			vecPedStdBikeJumpRhsAnimOffset = lastFrame->translation;
-		}
-	}
-
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_BIKE_VESPA, ANIM_BIKE_JUMPON_R)->hierarchy;
-	seq = enterAssoc->sequences;
-	CAnimManager::UncompressAnimation(enterAssoc);
-	if (seq->numFrames > 0) {
-		if (!seq->HasTranslation())
-			vecPedVespaBikeJumpRhsAnimOffset = CVector(0.0f, 0.0f, 0.0f);
-		else {
-			KeyFrameTrans* lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
-			vecPedVespaBikeJumpRhsAnimOffset = lastFrame->translation;
-		}
-	}
-
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_BIKE_HARLEY, ANIM_BIKE_JUMPON_R)->hierarchy;
-	seq = enterAssoc->sequences;
-	CAnimManager::UncompressAnimation(enterAssoc);
-	if (seq->numFrames > 0) {
-		if (!seq->HasTranslation())
-			vecPedHarleyBikeJumpRhsAnimOffset = CVector(0.0f, 0.0f, 0.0f);
-		else {
-			KeyFrameTrans* lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
-			vecPedHarleyBikeJumpRhsAnimOffset = lastFrame->translation;
-		}
-	}
-
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_BIKE_DIRT, ANIM_BIKE_JUMPON_R)->hierarchy;
-	seq = enterAssoc->sequences;
-	CAnimManager::UncompressAnimation(enterAssoc);
-	if (seq->numFrames > 0) {
-		if (!seq->HasTranslation())
-			vecPedDirtBikeJumpRhsAnimOffset = CVector(0.0f, 0.0f, 0.0f);
-		else {
-			KeyFrameTrans* lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
-			vecPedDirtBikeJumpRhsAnimOffset = lastFrame->translation;
-		}
-	}
-
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_BIKE_HARLEY, ANIM_BIKE_KICK)->hierarchy;
-	seq = enterAssoc->sequences;
-	CAnimManager::UncompressAnimation(enterAssoc);
-	if (seq->numFrames > 0) {
-		if (!seq->HasTranslation())
-			vecPedBikeKickAnimOffset = CVector(0.0f, 0.0f, 0.0f);
-		else {
-			KeyFrameTrans* lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
-			vecPedBikeKickAnimOffset = lastFrame->translation;
-		}
+		if (leftRight < 0.0f)
+			angle = HALFPI;
+		else if (leftRight > 0.0f)
+			angle = -HALFPI;
 	}
 
-	CAnimManager::RemoveAnimBlockRef(vanBlock);
-	CAnimManager::RemoveAnimBlockRef(bikesBlock);
-	CAnimManager::RemoveAnimBlockRef(bikevBlock);
-	CAnimManager::RemoveAnimBlockRef(bikehBlock);
-	CAnimManager::RemoveAnimBlockRef(bikedBlock);
+	return CGeneral::LimitRadianAngle(offset + angle);
 }
 
 // --MIAMI: Done
 void
-CPed::InvestigateEvent(void)
+CPed::UpdatePosition(void)
 {
-	CAnimBlendAssociation *animAssoc;
-	AnimationId animToPlay;
-	AssocGroupId animGroup;
-
-	if (m_nWaitState == WAITSTATE_TURN180)
-		return;
-
-	if (CTimer::GetTimeInMilliseconds() > m_standardTimer) {
-
-		if (m_standardTimer) {
-			if (m_eventType < EVENT_UNK)
-				SetWaitState(WAITSTATE_TURN180, nil);
-
-			m_standardTimer = 0;
-		} else {
-			ClearInvestigateEvent();
-		}
+	if (CReplay::IsPlayingBack() || !bIsStanding || m_attachedTo)
 		return;
-	}
-
-	CVector2D vecDist = m_eventOrThreat - GetPosition();
-	float distSqr = vecDist.MagnitudeSqr();
-	if (sq(m_distanceToCountSeekDone) >= distSqr) {
-
-		m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(vecDist.x, vecDist.y, 0.0f, 0.0f);
-		SetMoveState(PEDMOVE_STILL);
 
-		switch (m_eventType) {
-			case EVENT_DEAD_PED:
-			case EVENT_HIT_AND_RUN:
-			case EVENT_HIT_AND_RUN_COP:
-
-				if (CTimer::GetTimeInMilliseconds() > m_lookTimer) {
-					animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ROAD_CROSS);
-
-					if (animAssoc) {
-						animAssoc->blendDelta = -8.0f;
-						animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-						if (m_pEventEntity)
-							SetLookFlag(m_pEventEntity, true);
-
-						SetLookTimer(CGeneral::GetRandomNumberInRange(1500, 4000));
-
-					} else if (CGeneral::GetRandomNumber() & 3) {
-						ClearLookFlag();
-						CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_ROAD_CROSS, 4.0f);
-
-						SetLookTimer(CGeneral::GetRandomNumberInRange(1000, 2500));
-						Say(SOUND_PED_CHAT_EVENT);
-
-					} else {
-						ClearInvestigateEvent();
-					}
-				}
-				break;
-			case EVENT_FIRE:
-			case EVENT_EXPLOSION:
-
-				if (bHasACamera && CTimer::GetTimeInMilliseconds() > m_lookTimer) {
-					animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_CAM);
-					if (!animAssoc)
-						animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE);
-
-					if (animAssoc && animAssoc->animId == ANIM_IDLE_CAM) {
-						CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 4.0f);
-						SetLookTimer(CGeneral::GetRandomNumberInRange(1000, 2500));
-
-					} else if (CGeneral::GetRandomNumber() & 3) {
-						CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_CAM, 4.0f);
-						SetLookTimer(CGeneral::GetRandomNumberInRange(2500, 5000));
-						if (!CGame::germanGame)
-							Say(SOUND_PED_CHAT_EVENT);
-
-					} else {
-						m_standardTimer = 0;
-					}
-
-				} else if (CTimer::GetTimeInMilliseconds() > m_lookTimer) {
-					animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE);
-					if (!animAssoc)
-						animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_HBHB);
-
-					if (!animAssoc)
-						animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_XPRESS_SCRATCH);
-
-					if (animAssoc && animAssoc->animId == ANIM_IDLE_STANCE) {
-						if (CGeneral::GetRandomNumber() & 1)
-							animToPlay = ANIM_IDLE_HBHB;
-						else
-							animToPlay = ANIM_XPRESS_SCRATCH;
-
-						CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animToPlay, 4.0f);
-						SetLookTimer(CGeneral::GetRandomNumberInRange(1500, 4000));
-
-					} else if (animAssoc && animAssoc->animId == ANIM_IDLE_HBHB) {
-						animAssoc->blendDelta = -8.0f;
-						animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-						if (CGeneral::GetRandomNumber() & 1) {
-							animToPlay = ANIM_IDLE_STANCE;
-							animGroup = m_animGroup;
-						} else {
-							animToPlay = ANIM_XPRESS_SCRATCH;
-							animGroup = ASSOCGRP_STD;
-						}
-
-						CAnimManager::BlendAnimation(GetClump(), animGroup, animToPlay, 4.0f);
-						SetLookTimer(CGeneral::GetRandomNumberInRange(1000, 2500));
-
-					} else {
-						if (CGeneral::GetRandomNumber() & 1) {
-							animToPlay = ANIM_IDLE_STANCE;
-							animGroup = m_animGroup;
-						} else {
-							animToPlay = ANIM_IDLE_HBHB;
-							animGroup = ASSOCGRP_STD;
-						}
-
-						CAnimManager::BlendAnimation(GetClump(), animGroup, animToPlay, 4.0f);
-						SetLookTimer(CGeneral::GetRandomNumberInRange(1000, 2500));
-					}
-					if (!CGame::germanGame)
-						Say(SOUND_PED_CHAT_EVENT);
-				}
-				break;
-			case EVENT_ICECREAM:
-			case EVENT_SHOPSTALL:
+	CVector2D velocityChange;
 
-				m_fRotationDest = m_fAngleToEvent;
-				if (CTimer::GetTimeInMilliseconds() > m_lookTimer) {
+	SetHeading(m_fRotationCur);
+	if (m_pCurrentPhysSurface) {
+		CVector2D velocityOfSurface;
+		if (!IsPlayer() && m_pCurrentPhysSurface->IsVehicle() && ((CVehicle*)m_pCurrentPhysSurface)->IsBoat()) {
 
-					if (m_lookTimer) {
-						animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ROAD_CROSS);
+			// It seems R* didn't like m_vecOffsetFromPhysSurface for boats
+			CVector offsetToSurface = GetPosition() - m_pCurrentPhysSurface->GetPosition();
+			offsetToSurface.z -= FEET_OFFSET;
 
-						if (animAssoc) {
-							animAssoc->blendDelta = -8.0f;
-							animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-							if (m_eventType == EVENT_ICECREAM)
-								animToPlay = ANIM_IDLE_CHAT;
-							else
-								animToPlay = ANIM_XPRESS_SCRATCH;
-							CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animToPlay,4.0f);
-							SetLookTimer(CGeneral::GetRandomNumberInRange(2000, 5000));
+			CVector surfaceMoveVelocity = m_pCurrentPhysSurface->m_vecMoveSpeed;
+			CVector surfaceTurnVelocity = CrossProduct(m_pCurrentPhysSurface->m_vecTurnSpeed, offsetToSurface);
 
-						} else {
-							animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_CHAT);
-							if (animAssoc) {
-								animAssoc->blendDelta = -8.0f;
-								animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-								ClearInvestigateEvent();
-							} else {
-								animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_XPRESS_SCRATCH);
-								if (animAssoc) {
-									animAssoc->blendDelta = -8.0f;
-									animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-								}
-								ClearInvestigateEvent();
-							}
-						}
-					} else {
-						CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_ROAD_CROSS, 4.0f);
-						SetLookTimer(CGeneral::GetRandomNumberInRange(1000, 2500));
-					}
-				}
-				break;
-			default:
-				return;
+			// Also we use that weird formula instead of friction if it's boat
+			float slideMult = -m_pCurrentPhysSurface->m_vecTurnSpeed.MagnitudeSqr();
+			velocityOfSurface = slideMult * offsetToSurface * CTimer::GetTimeStep() + (surfaceTurnVelocity + surfaceMoveVelocity);
+			m_vecMoveSpeed.z = slideMult * offsetToSurface.z * CTimer::GetTimeStep() + (surfaceTurnVelocity.z + surfaceMoveVelocity.z);
+		} else {
+			velocityOfSurface = m_pCurrentPhysSurface->GetSpeed(m_vecOffsetFromPhysSurface);
 		}
-	} else {
-		m_vecSeekPos.x = m_eventOrThreat.x;
-		m_vecSeekPos.y = m_eventOrThreat.y;
-		m_vecSeekPos.z = GetPosition().z;
-		Seek();
+		// Reminder: m_moved is displacement from walking/running.
+		velocityChange = m_moved + velocityOfSurface - m_vecMoveSpeed;
+		m_fRotationCur += m_pCurrentPhysSurface->m_vecTurnSpeed.z * CTimer::GetTimeStep();
+		m_fRotationDest += m_pCurrentPhysSurface->m_vecTurnSpeed.z * CTimer::GetTimeStep();
+	} else if (m_nSurfaceTouched == SURFACE_STEEP_CLIFF && (m_vecDamageNormal.x != 0.0f || m_vecDamageNormal.y != 0.0f)) {
+		// Ped got damaged by steep slope
+		m_vecMoveSpeed = CVector(0.0f, 0.0f, -0.001f);
+		// some kind of
+		CVector2D reactionForce = m_vecDamageNormal;
+		reactionForce.Normalise();
 
-		if (m_eventType < EVENT_ICECREAM) {
-			if (sq(5.0f + m_distanceToCountSeekDone) < distSqr) {
-				SetMoveState(PEDMOVE_RUN);
-				return;
-			}
-		}
-		if (m_eventType <= EVENT_EXPLOSION || m_eventType >= EVENT_SHOPSTALL) {
-			SetMoveState(PEDMOVE_WALK);
-			return;
-		}
-		if (distSqr > sq(1.2f)) {
-			SetMoveState(PEDMOVE_WALK);
-			return;
-		}
+		velocityChange = 0.02f * reactionForce + m_moved;
 
-		bool willStandStill = false;
-		for (int i = 0; i < m_numNearPeds; i++) {
-			if ((m_eventOrThreat - m_nearPeds[i]->GetPosition()).MagnitudeSqr() < sq(0.4f)) {
-				SetMoveState(PEDMOVE_STILL);
-				willStandStill = true;
-				break;
-			}
+		float reactionAndVelocityDotProd = DotProduct2D(reactionForce, velocityChange);
+		// they're in same direction
+		if (reactionAndVelocityDotProd < 0.0f) {
+			velocityChange -= reactionAndVelocityDotProd * reactionForce;
 		}
-
-		if (!willStandStill)
-			SetMoveState(PEDMOVE_WALK);
-	}
-}
-
-// --MIAMI: Done
-bool
-CPed::IsPedDoingDriveByShooting(void)
-{
-#ifdef FIX_BUGS
-	if (FindPlayerPed() == this && CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_nWeaponSlot == 5) {
-#else
-	if (FindPlayerPed() == this && GetWeapon()->m_eWeaponType == WEAPONTYPE_UZI) {
-#endif
-		if (TheCamera.Cams[TheCamera.ActiveCam].LookingLeft || TheCamera.Cams[TheCamera.ActiveCam].LookingRight)
-			return true;
-	}
-	return false;
-}
-
-// --MIAMI: Done
-bool
-CPed::IsPedShootable(void)
-{
-	return m_nPedState <= PED_STATES_NO_ST;
-}
-
-// --MIAMI: Done
-bool
-CPed::IsRoomToBeCarJacked(void)
-{
-	if (!m_pMyVehicle)
-		return false;
-
-	CVector offset;
-	if (m_pMyVehicle->IsBike()) {
-		offset = vecPedStdBikeJumpRhsAnimOffset;
-	} else if (m_pMyVehicle->bLowVehicle || m_nPedType == PEDTYPE_COP) {
-		offset = vecPedDraggedOutCarAnimOffset;
 	} else {
-		offset = vecPedQuickDraggedOutCarAnimOffset;
-	}
-
-	offset.z = 0.0f;
-	if (m_pMyVehicle->IsRoomForPedToLeaveCar(CAR_DOOR_LF, &offset)) {
-		return true;
-	}
-
-	return false;
-}
-
-// --MIAMI: Done
-void
-CPed::KillPedWithCar(CVehicle *car, float impulse)
-{
-	CVehicleModelInfo *vehModel;
-	CColModel *vehColModel;
-	uint8 damageDir;
-	PedNode nodeToDamage;
-	eWeaponType killMethod;
-
-	if (m_nPedState == PED_FALL || m_nPedState == PED_DIE) {
-		if (!m_pCollidingEntity || car->GetStatus() == STATUS_PLAYER)
-			m_pCollidingEntity = car;
-		return;
-	}
-
-	if (m_nPedState == PED_DEAD)
-		return;
-
-	if (m_pCurSurface) {
-		if (m_pCurSurface->IsVehicle() && (((CVehicle*)m_pCurSurface)->IsBoat()|| IsPlayer()))
-			return;
+		velocityChange = m_moved - m_vecMoveSpeed;
 	}
-
-	CVector distVec = GetPosition() - car->GetPosition();
-
-	if ((impulse > 12.0f || car->GetModelIndex() == MI_TRAIN) && !IsPlayer()) {
-		nodeToDamage = PED_TORSO;
-		killMethod = WEAPONTYPE_RAMMEDBYCAR;
-		uint8 randVal = CGeneral::GetRandomNumber() & 3;
-
-		if (car == FindPlayerVehicle()) {
-			float carSpeed = car->m_vecMoveSpeed.Magnitude();
-			uint8 shakeFreq;
-			if (100.0f * carSpeed * 2000.0f / car->m_fMass + 80.0f <= 250.0f) {
-				shakeFreq = 100.0f * carSpeed * 2000.0f / car->m_fMass + 80.0f;
-			} else {
-				shakeFreq = 250.0f;
-			}
-			CPad::GetPad(0)->StartShake(40000 / shakeFreq, shakeFreq);
-		}
-		bIsStanding = false;
-		damageDir = GetLocalDirection(-m_vecMoveSpeed);
-		vehModel = (CVehicleModelInfo *)CModelInfo::GetModelInfo(car->GetModelIndex());
-		vehColModel = vehModel->GetColModel();
-		float carRightAndDistDotProd = DotProduct(distVec, car->GetRight());
-
-		if (car->GetModelIndex() == MI_TRAIN) {
-			killMethod = WEAPONTYPE_RUNOVERBYCAR;
-			nodeToDamage = PED_HEAD;
-			m_vecMoveSpeed = 0.9f * car->m_vecMoveSpeed;
-			m_vecMoveSpeed.z = 0.0f;
-			if (damageDir == 1 || damageDir == 3)
-				damageDir = 2;
-			if (CGame::nastyGame)
-				DMAudio.PlayOneShot(m_audioEntityId, SOUND_SPLATTER, 0.0f);
-
-		// Car doesn't look to us
-		} else if (DotProduct(car->m_vecMoveSpeed, car->GetForward()) >= 0.0f){
-
-			if (0.99f * vehColModel->boundingBox.max.x < Abs(carRightAndDistDotProd)) {
-
-				// We're at the right of the car
-				if (carRightAndDistDotProd <= 0.0f)
-					nodeToDamage = PED_UPPERARML;
-				else
-					nodeToDamage = PED_UPPERARMR;
-
-				if (Abs(DotProduct(distVec, car->GetForward())) < 0.85f * vehColModel->boundingBox.max.y) {
-					killMethod = WEAPONTYPE_RUNOVERBYCAR;
-					m_vecMoveSpeed = 0.9f * car->m_vecMoveSpeed;
-					m_vecMoveSpeed.z = 0.0f;
-					if (damageDir == 1 || damageDir == 3)
-						damageDir = 2;
-					if (CGame::nastyGame)
-						DMAudio.PlayOneShot(m_audioEntityId, SOUND_SPLATTER, 0.0f);
-
-				}
-			} else {
-				float carFrontAndDistDotProd = DotProduct(distVec, car->GetForward());
-
-				// carFrontAndDistDotProd <= 0.0 car looks to us
-				if ((carFrontAndDistDotProd <= 0.1 || randVal <= 1) && randVal != 0) {
-					killMethod = WEAPONTYPE_RUNOVERBYCAR;
-					nodeToDamage = PED_HEAD;
-					m_vecMoveSpeed = 0.9f * car->m_vecMoveSpeed;
-					m_vecMoveSpeed.z = 0.0f;
-					if (damageDir == 1 || damageDir == 3)
-						damageDir = 2;
-
-					if (CGame::nastyGame)
-						DMAudio.PlayOneShot(m_audioEntityId, SOUND_SPLATTER, 0.0f);
-
-				} else {
-					nodeToDamage = PED_MID;
-					float vehColMaxY = vehColModel->boundingBox.max.y;
-					float vehColMinY = vehColModel->boundingBox.min.y;
-					float vehColMaxZ = vehColModel->boundingBox.max.z;
-					float carFrontZ = car->GetForward().z;
-					float carHighestZ, carLength;
-
-					if (carFrontZ < -0.2f) {
-						// Highest point of car's back
-						carHighestZ = (car->GetMatrix() * CVector(0.0f, vehColMinY, vehColMaxZ)).z;
-						carLength = vehColMaxY - vehColMinY;
-
-					} else if (carFrontZ > 0.1f) {
-						// Highest point of car's front
-						carHighestZ = (car->GetMatrix() * CVector(0.0f, vehColMaxY, vehColMaxZ)).z;
-						float highestZDist = carHighestZ - GetPosition().z;
-						if (highestZDist > 0.0f) {
-							GetMatrix().GetPosition().z += 0.5f * highestZDist;
-							carHighestZ += highestZDist * 0.25f;
-						}
-						carLength = vehColMaxY;
-
-					} else {
-						// Highest point of car's front
-						carHighestZ = (car->GetMatrix() * CVector(0.0f, vehColMaxY, vehColMaxZ)).z;
-						carLength = vehColMaxY;
-					}
-
-					float pedJumpSpeedToReachHighestZ = (carHighestZ - GetPosition().z) / (carLength / car->m_vecMoveSpeed.Magnitude());
-
-					// TODO: What are we doing down here?
-					float unknown = ((CGeneral::GetRandomNumber() % 256) * 0.002 + 1.5) * pedJumpSpeedToReachHighestZ;
-
-					// After this point distVec isn't really distVec.
-					distVec = car->m_vecMoveSpeed;
-					distVec.Normalise();
-					distVec *= 0.2 * unknown;
-
-					if (damageDir != 1 && damageDir != 3)
-						distVec.z += unknown;
-					else
-						distVec.z += 1.5f * unknown;
-
-					m_vecMoveSpeed = distVec;
-					damageDir += 2;
-					if (damageDir > 3)
-						damageDir = damageDir - 4;
-
-					if (car->IsCar()) {
-						CObject *bonnet = ((CAutomobile*)car)->RemoveBonnetInPedCollision();
-
-						if (bonnet) {
-							if (CGeneral::GetRandomNumber() & 1) {
-								bonnet->m_vecMoveSpeed += Multiply3x3(car->GetMatrix(), CVector(0.1f, 0.0f, 0.5f));
-							} else {
-								bonnet->m_vecMoveSpeed += Multiply3x3(car->GetMatrix(), CVector(-0.1f, 0.0f, 0.5f));
-							}
-							CVector forceDir = car->GetUp() * 10.0f;
-							bonnet->ApplyTurnForce(forceDir, car->GetForward());
-						}
-					}
-				}
-			}
-		}
-
-		if (car->pDriver) {
-			CEventList::RegisterEvent((m_nPedType == PEDTYPE_COP ? EVENT_HIT_AND_RUN_COP : EVENT_HIT_AND_RUN), EVENT_ENTITY_PED, this, car->pDriver, 1000);
-		}
-
-		ePedPieceTypes pieceToDamage;
-		switch (nodeToDamage) {
-			case PED_HEAD:
-				pieceToDamage = PEDPIECE_HEAD;
-				break;
-			case PED_UPPERARML:
-				pieceToDamage = PEDPIECE_LEFTARM;
-				break;
-			case PED_UPPERARMR:
-				pieceToDamage = PEDPIECE_RIGHTARM;
-				break;
-			default:
-				pieceToDamage = PEDPIECE_MID;
-				break;
-		}
-		InflictDamage(car, killMethod, 1000.0f, pieceToDamage, damageDir);
-
-		if (DyingOrDead()
-			&& bIsPedDieAnimPlaying && !m_pCollidingEntity) {
-			m_pCollidingEntity = car;
-		}
-		if (nodeToDamage == PED_MID)
-			bKnockedUpIntoAir = true;
-		else
-			bKnockedUpIntoAir = false;
-
-		distVec.Normalise();
-
-		distVec *= Min(car->m_fMass / 1400.0f, 1.0f);
-		car->ApplyMoveForce(distVec * -100.0f);
-		Say(SOUND_PED_DEFEND);
-
-	} else if (m_vecDamageNormal.z < -0.8f && impulse > 3.0f
-		|| impulse > 6.0f && (!IsPlayer() || impulse > 10.0f)) {
-
-		bIsStanding = false;
-		uint8 fallDirection = GetLocalDirection(-car->m_vecMoveSpeed);
-		float damage;
-		if (IsPlayer() && car->GetModelIndex() == MI_TRAIN)
-			damage = 150.0f;
-		else
-			damage = 30.0f;
 	
-		InflictDamage(car, WEAPONTYPE_RAMMEDBYCAR, damage, PEDPIECE_TORSO, fallDirection);
-		SetFall(1000, (AnimationId)(fallDirection + ANIM_KO_SKID_FRONT), true);
-
-		if (OnGround() && !m_pCollidingEntity &&
-			(!IsPlayer() || bHasHitWall || car->GetModelIndex() == MI_TRAIN || m_vecDamageNormal.z < -0.8f)) {
-
-			m_pCollidingEntity = car;
-		}
-
-		bKnockedUpIntoAir = false;
-		if (car->GetModelIndex() != MI_TRAIN && !bHasHitWall) {
-			m_vecMoveSpeed = car->m_vecMoveSpeed * 0.75f;
+	// Take time step into account
+	if (m_pCurrentPhysSurface && (!m_pCurrentPhysSurface->bInfiniteMass || m_pCurrentPhysSurface->m_phy_flagA08)) {
+		float speedChange = velocityChange.Magnitude();
+		float changeMult = speedChange;
+		if (m_nPedState == PED_DIE && m_pCurrentPhysSurface->IsVehicle()) {
+			changeMult = 0.002f * CTimer::GetTimeStep();
+		} else if (!(m_pCurrentPhysSurface->IsVehicle() && ((CVehicle*)m_pCurrentPhysSurface)->IsBoat())) {
+			changeMult = 0.01f * CTimer::GetTimeStep();
 		}
-		m_vecMoveSpeed.z = 0.0f;
-		distVec.Normalise();
-		distVec *= Min(car->m_fMass / 1400.0f, 1.0f);
-		car->ApplyMoveForce(distVec * -60.0f);
-		Say(SOUND_PED_DEFEND);
-	}
 
-	if (IsGangMember()) {
-		CPed *driver = car->pDriver;
-		if (driver && driver->IsPlayer()
-#ifdef FIX_BUGS
-			&& (CharCreatedBy != MISSION_CHAR || bRespondsToThreats) && (!m_leader || m_leader != driver)
-#endif
-			) {
-			RegisterThreatWithGangPeds(driver);
+		if (speedChange > changeMult) {
+			velocityChange = velocityChange * (changeMult / speedChange);
 		}
 	}
+	m_vecMoveSpeed.x += velocityChange.x;
+	m_vecMoveSpeed.y += velocityChange.y;
 }
 
 // --MIAMI: Done
 void
-CPed::Look(void)
-{
-	TurnBody();
-}
-
-// --MIAMI: Done
-bool
-CPed::LookForInterestingNodes(void)
+CPed::CalculateNewOrientation(void)
 {
-	CBaseModelInfo *model;
-	CPtrNode *ptrNode;
-	CVector effectDist;
-	C2dEffect *effect;
-	CMatrix *objMat;
-
-	if ((CTimer::GetFrameCounter() + (m_randomSeed % 256)) & 7 || CTimer::GetTimeInMilliseconds() <= m_standardTimer) {
-		return false;
-	}
-	bool found = false;
-	uint8 randVal = CGeneral::GetRandomNumber() % 256;
-
-	int minX = CWorld::GetSectorIndexX(GetPosition().x - CHECK_NEARBY_THINGS_MAX_DIST);
-	if (minX < 0) minX = 0;
-	int minY = CWorld::GetSectorIndexY(GetPosition().y - CHECK_NEARBY_THINGS_MAX_DIST);
-	if (minY < 0) minY = 0;
-	int maxX = CWorld::GetSectorIndexX(GetPosition().x + CHECK_NEARBY_THINGS_MAX_DIST);
-#ifdef FIX_BUGS
-	if (maxX >= NUMSECTORS_X) maxX = NUMSECTORS_X - 1;
-#else
-	if (maxX >= NUMSECTORS_X) maxX = NUMSECTORS_X;
-#endif
-
-	int maxY = CWorld::GetSectorIndexY(GetPosition().y + CHECK_NEARBY_THINGS_MAX_DIST);
-#ifdef FIX_BUGS
-	if (maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y - 1;
-#else
-	if (maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y;
-#endif
-
-	for (int curY = minY; curY <= maxY && !found; curY++) {
-		for (int curX = minX; curX <= maxX && !found; curX++) {
-			CSector *sector = CWorld::GetSector(curX, curY);
-
-			for (ptrNode = sector->m_lists[ENTITYLIST_VEHICLES].first; ptrNode && !found; ptrNode = ptrNode->next) {
-				CVehicle *veh = (CVehicle*)ptrNode->item;
-				model = veh->GetModelInfo();
-				if (model->GetNum2dEffects() != 0) {
-					for (int e = 0; e < model->GetNum2dEffects(); e++) {
-						effect = model->Get2dEffect(e);
-						if (effect->type == EFFECT_ATTRACTOR && effect->attractor.probability >= randVal) {
-							objMat = &veh->GetMatrix();
-							CVector effectPos = veh->GetMatrix() * effect->pos;
-							effectDist = effectPos - GetPosition();
-							if (effectDist.MagnitudeSqr() < sq(8.0f)) {
-								found = true;
-								break;
-							}
-						}
-					}
-				}
-			}
-			for (ptrNode = sector->m_lists[ENTITYLIST_OBJECTS].first; ptrNode && !found; ptrNode = ptrNode->next) {
-				CObject *obj = (CObject*)ptrNode->item;
-				model = CModelInfo::GetModelInfo(obj->GetModelIndex());
-				if (model->GetNum2dEffects() != 0) {
-					for (int e = 0; e < model->GetNum2dEffects(); e++) {
-						effect = model->Get2dEffect(e);
-						if (effect->type == EFFECT_ATTRACTOR && effect->attractor.probability >= randVal) {
-							objMat = &obj->GetMatrix();
-							CVector effectPos = obj->GetMatrix() * effect->pos;
-							effectDist = effectPos - GetPosition();
-							if (effectDist.MagnitudeSqr() < sq(8.0f)) {
-								found = true;
-								break;
-							}
-						}
-					}
-				}
-			}
-			for (ptrNode = sector->m_lists[ENTITYLIST_BUILDINGS].first; ptrNode && !found; ptrNode = ptrNode->next) {
-				CBuilding *building = (CBuilding*)ptrNode->item;
-				model = CModelInfo::GetModelInfo(building->GetModelIndex());
-				if (model->GetNum2dEffects() != 0) {
-					for (int e = 0; e < model->GetNum2dEffects(); e++) {
-						effect = model->Get2dEffect(e);
-						if (effect->type == EFFECT_ATTRACTOR && effect->attractor.probability >= randVal) {
-							objMat = &building->GetMatrix();
-							CVector effectPos = building->GetMatrix() * effect->pos;
-							effectDist = effectPos - GetPosition();
-							if (effectDist.MagnitudeSqr() < sq(8.0f)) {
-								found = true;
-								break;
-							}
-						}
-					}
-				}
-			}
-			for (ptrNode = sector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP].first; ptrNode && !found; ptrNode = ptrNode->next) {
-				CBuilding *building = (CBuilding*)ptrNode->item;
-				model = CModelInfo::GetModelInfo(building->GetModelIndex());
-				if (model->GetNum2dEffects() != 0) {
-					for (int e = 0; e < model->GetNum2dEffects(); e++) {
-						effect = model->Get2dEffect(e);
-						if (effect->type == EFFECT_ATTRACTOR && effect->attractor.probability >= randVal) {
-							objMat = &building->GetMatrix();
-							CVector effectPos = building->GetMatrix() * effect->pos;
-							effectDist = effectPos - GetPosition();
-							if (effectDist.MagnitudeSqr() < sq(8.0f)) {
-								found = true;
-								break;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	if (!found)
-		return false;
-
-	CVector effectFrontLocal = Multiply3x3(*objMat, effect->attractor.dir);
-	float angleToFace = CGeneral::GetRadianAngleBetweenPoints(effectFrontLocal.x, effectFrontLocal.y, 0.0f, 0.0f);
-	randVal = CGeneral::GetRandomNumber() % 256;
-	if (randVal <= m_randomSeed % 256) {
-		m_standardTimer = CTimer::GetTimeInMilliseconds() + 2000;
-		SetLookFlag(angleToFace, true);
-		SetLookTimer(1000);
-		return false;
-	}
+	if (CReplay::IsPlayingBack() || !IsPedInControl())
+		return;
 
-	CVector2D effectPos = *objMat * effect->pos;
-	switch (effect->attractor.type) {
-		case ATTRACTORTYPE_ICECREAM:
-			SetInvestigateEvent(EVENT_ICECREAM, effectPos, 0.1f, 15000, angleToFace);
-			break;
-		case ATTRACTORTYPE_STARE:
-			SetInvestigateEvent(EVENT_SHOPSTALL, effectPos, 1.0f,
-								CGeneral::GetRandomNumberInRange(8000, 10 * effect->attractor.probability + 8500),
-								angleToFace);
-			break;
-		default:
-			return true;
-	}
-	return true;
+	SetHeading(m_fRotationCur);
 }
 
 // --MIAMI: Done
 void
-CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCountDone, uint16 time, float angle)
+CPed::ClearAll(void)
 {
-	if (!IsPedInControl() || CharCreatedBy == MISSION_CHAR)
+	if (!IsPedInControl() && m_nPedState != PED_DEAD)
 		return;
 
-	SetStoredState();
-	bFindNewNodeAfterStateRestore = false;
-	SetPedState(PED_INVESTIGATE);
-	m_standardTimer = CTimer::GetTimeInMilliseconds() + time;
-	m_eventType = event;
-	m_eventOrThreat = pos;
-	m_distanceToCountSeekDone = distanceToCountDone;
-	m_fAngleToEvent = angle;
-
-	if (m_eventType >= EVENT_ICECREAM)
-		m_lookTimer = 0;
-	else
-		CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_HANDSCOWER, 4.0f);
-
+	SetPedState(PED_NONE);
+	m_nMoveState = PEDMOVE_NONE;
+	m_pSeekTarget = nil;
+	m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
+	m_fleeFromPos = CVector2D(0.0f, 0.0f);
+	m_fleeFrom = nil;
+	m_fleeTimer = 0;
+	m_threatEx = nil;
+	bUsesCollision = true;
+	ClearPointGunAt();
+	bIsPointingGunAt = false;
+	bRenderPedInCar = true;
+	bKnockedUpIntoAir = false;
+	bKnockedOffBike = false;
+	m_pCollidingEntity = nil;
 }
 
 // --MIAMI: Done
 void
-CPed::LookForSexyCars(void)
+CPed::ProcessBuoyancy(void)
 {
-	CEntity *vehicles[8];
-	CVehicle *veh;
-	int foundVehId = 0;
-	int bestPriceYet = 0;
-	int16 lastVehicle;
+	float buoyancyLevel = 1.1f;
+	static uint32 nGenerateRaindrops = 0;
+	static uint32 nGenerateWaterCircles = 0;
+	CRGBA color;
 
-	if (!IsPedInControl() && m_nPedState != PED_DRIVING)
+	if (bInVehicle)
 		return;
 
-	if (m_lookTimer < CTimer::GetTimeInMilliseconds()) {
-		CWorld::FindObjectsInRange(GetPosition(), 10.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
-
-		for (int vehId = 0; vehId < lastVehicle; vehId++) {
-			veh = (CVehicle*)vehicles[vehId];
-			if (veh != m_pMyVehicle && bestPriceYet < veh->pHandling->nMonetaryValue) {
-				foundVehId = vehId;
-				bestPriceYet = veh->pHandling->nMonetaryValue;
-			}
-		}
-		if (lastVehicle > 0 && bestPriceYet > 40000)
-			SetLookFlag(vehicles[foundVehId], false);
-
-		m_lookTimer = CTimer::GetTimeInMilliseconds() + 10000;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::LookForSexyPeds(void)
-{
-	if ((!IsPedInControl() && m_nPedState != PED_DRIVING)
-		|| m_lookTimer >= CTimer::GetTimeInMilliseconds() || m_nPedType != PEDTYPE_CIVMALE)
-		return;
+	CVector buoyancyPoint;
+	CVector buoyancyImpulse;
 
-	for (int i = 0; i < m_numNearPeds; i++) {
-		if (CanSeeEntity(m_nearPeds[i])) {
-			if ((GetPosition() - m_nearPeds[i]->GetPosition()).Magnitude() < 10.0f) {
-				CPed *nearPed = m_nearPeds[i];
-				if ((nearPed->m_pedStats->m_sexiness > m_pedStats->m_sexiness)
-					&& nearPed->m_nPedType == PEDTYPE_CIVFEMALE) {
+	if (DyingOrDead())
+		buoyancyLevel = 1.8f;
 
-					SetLookFlag(nearPed, true);
-					m_lookTimer = CTimer::GetTimeInMilliseconds() + 4000;
-					Say(SOUND_PED_CHAT_SEXY);
-					return;
-				}
-			}
+	if (mod_Buoyancy.ProcessBuoyancy(this, GRAVITY * m_fMass * buoyancyLevel, &buoyancyPoint, &buoyancyImpulse)) {
+		bTouchingWater = true;
+		CEntity *entity;
+		CColPoint point;
+		if (CWorld::ProcessVerticalLine(GetPosition(), GetPosition().z - 3.0f, point, entity, false, true, false, false, false, false, nil)
+			&& entity->IsVehicle() && ((CVehicle*)entity)->IsBoat() && !entity->bRenderScorched) {
+			bIsInWater = false;
+			return;
 		}
-	}
-	m_lookTimer = CTimer::GetTimeInMilliseconds() + 10000;
-} 
-
-// --MIAMI: Done
-void
-CPed::MakeTyresMuddySectorList(CPtrList &list)
-{
-	CAutomobile *car = nil;
-	CBike *bike = nil;
-	for (CPtrNode *node = list.first; node; node = node->next) {
-		CVehicle *veh = (CVehicle*)node->item;
-		if (veh->m_scanCode != CWorld::GetCurrentScanCode()) {
-			veh->m_scanCode = CWorld::GetCurrentScanCode();
-
-			if (Abs(GetPosition().x - veh->GetPosition().x) < 10.0f && Abs(GetPosition().y - veh->GetPosition().y) < 10.0f) {				
-				if (veh->IsCar()) {
-					bike = nil;
-					car = (CAutomobile*)veh;
-				} else if (veh->IsBike()) {
-					bike = (CBike*)veh;
-					car = nil;
-				}
-				if (veh->m_vecMoveSpeed.MagnitudeSqr2D() > 0.05f) {
-					if (car) {
-						for (int wheel = 0; wheel < 4; wheel++) {
-							if (!car->m_aWheelSkidmarkBloody[wheel] && car->m_aSuspensionSpringRatio[wheel] < 1.0f) {
-
-								CColModel* vehCol = car->GetModelInfo()->GetColModel();
-								CVector approxWheelOffset;
-								switch (wheel) {
-								case 0:
-									approxWheelOffset = CVector(-vehCol->boundingBox.max.x, vehCol->boundingBox.max.y, 0.0f);
-									break;
-								case 1:
-									approxWheelOffset = CVector(-vehCol->boundingBox.max.x, vehCol->boundingBox.min.y, 0.0f);
-									break;
-								case 2:
-									approxWheelOffset = CVector(vehCol->boundingBox.max.x, vehCol->boundingBox.max.y, 0.0f);
-									break;
-								case 3:
-									approxWheelOffset = CVector(vehCol->boundingBox.max.x, vehCol->boundingBox.min.y, 0.0f);
-									break;
-								default:
-									break;
-								}
-
-								// I hope so
-								CVector wheelPos = car->GetMatrix() * approxWheelOffset;
-								if (Abs(wheelPos.z - GetPosition().z) < 2.0f) {
-
-									if ((wheelPos - GetPosition()).MagnitudeSqr2D() < 1.0f) {
-										if (CGame::nastyGame) {
-											car->m_aWheelSkidmarkBloody[wheel] = true;
-											DMAudio.PlayOneShot(car->m_audioEntityId, SOUND_SPLATTER, 0.0f);
-										}
-										if (car->m_fMass > 500.f) {
-											car->ApplyMoveForce(CVector(0.0f, 0.0f, 50.0f * Min(1.0f, m_fMass * 0.001f)));
-
-											CVector vehAndWheelDist = wheelPos - car->GetPosition();
-											car->ApplyTurnForce(CVector(0.0f, 0.0f, 50.0f * Min(1.0f, m_fTurnMass * 0.0005f)), vehAndWheelDist);
-											if (car == FindPlayerVehicle()) {
-												CPad::GetPad(0)->StartShake(300, 70);
-											}
-										}
-									}
-								}
-							}
-						}
-					} else if (bike) {
-						for (int wheel = 0; wheel < 2; wheel++) {
-							if (!bike->m_aWheelSkidmarkBloody[wheel] && bike->m_aSuspensionSpringRatio[wheel] < 1.0f) {
-
-								CColModel* vehCol = bike->GetModelInfo()->GetColModel();
-								CVector approxWheelOffset;
-								switch (wheel) {
-								case 0:
-									approxWheelOffset = CVector(0.0f, 0.8f * vehCol->boundingBox.max.y, 0.0f);
-									break;
-								case 1:
-									approxWheelOffset = CVector(0.0f, 0.8f * vehCol->boundingBox.min.y, 0.0f);
-								default:
-									break;
-								}
-
-								// I hope so
-								CVector wheelPos = bike->GetMatrix() * approxWheelOffset;
-								if (Abs(wheelPos.z - GetPosition().z) < 2.0f) {
-
-									if ((wheelPos - GetPosition()).MagnitudeSqr2D() < 1.0f) {
-										if (CGame::nastyGame) {
-											bike->m_aWheelSkidmarkBloody[wheel] = true;
-											DMAudio.PlayOneShot(bike->m_audioEntityId, SOUND_SPLATTER, 0.0f);
-										}
-										if (bike->m_fMass > 100.0f) {
-											bike->ApplyMoveForce(CVector(0.0f, 0.0f, 10.0f));
-
-											CVector vehAndWheelDist = wheelPos - bike->GetPosition();
-											bike->ApplyTurnForce(CVector(0.0f, 0.0f, 10.0f), vehAndWheelDist);
+		color.r = (0.5f * CTimeCycle::GetDirectionalRed() + CTimeCycle::GetAmbientRed()) * 127.5f;
+		color.g = (0.5f * CTimeCycle::GetDirectionalBlue() + CTimeCycle::GetAmbientBlue()) * 127.5f;
+		color.b = (0.5f * CTimeCycle::GetDirectionalGreen() + CTimeCycle::GetAmbientGreen()) * 127.5f;
+		color.a = (CGeneral::GetRandomNumber() % 256 * 48.0f) + 48;
+		bIsInWater = true;
+		ApplyMoveForce(buoyancyImpulse);
+		if (!DyingOrDead()) {
+			if (bTryingToReachDryLand) {
+				if (buoyancyImpulse.z / m_fMass > GRAVITY * 0.4f * CTimer::GetTimeStep()) {
+					bTryingToReachDryLand = false;
+					CVector pos = GetPosition();
+					if (PlacePedOnDryLand()) {
+						if (m_fHealth > 20.0f)
+							InflictDamage(nil, WEAPONTYPE_DROWNING, 15.0f, PEDPIECE_TORSO, false);
 
-											if (bike == FindPlayerVehicle()) {
-												CPad::GetPad(0)->StartShake(300, 70);
-											}
-										}
-									}
-								}
-							}
+						if (bIsInTheAir) {
+							RpAnimBlendClumpSetBlendDeltas(GetClump(), ASSOC_PARTIAL, -1000.0f);
+							bIsInTheAir = false;
 						}
+						pos.z = pos.z - 0.8f;
+						CParticleObject::AddObject(POBJECT_PED_WATER_SPLASH, pos, CVector(0.0f, 0.0f, 0.0f), 0.0f, 50, color, true);
+						m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
+						SetPedState(PED_IDLE);
+						return;
 					}
 				}
 			}
 		}
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::Mug(void)
-{
-	if (m_pSeekTarget && m_pSeekTarget->IsPed()) {
-
-		if (CTimer::GetTimeInMilliseconds() <= m_attackTimer - 2000) {
-			if ((m_pSeekTarget->GetPosition() - GetPosition()).Magnitude() > 3.0f)
-				m_wepSkills = 50;
-
-			Say(SOUND_PED_MUGGING);
-			((CPed*)m_pSeekTarget)->Say(SOUND_PED_ROBBED);
-		} else {
-			SetWanderPath(CGeneral::GetRandomNumber() & 7);
-			SetFlee(m_pSeekTarget, 20000);
-		}
-
-	} else {
-		SetIdle();
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::MoveHeadToLook(void)
-{
-	CVector lookPos;
-
-	if (m_lookTimer && CTimer::GetTimeInMilliseconds() > m_lookTimer) {
-		ClearLookFlag();
-	} 
-
-	if (bIsLooking || bIsRestoringLook)
-		if (!CanUseTorsoWhenLooking())
-			m_pedIK.m_flags |= CPedIK::LOOKAROUND_HEAD_ONLY;
-
-	if (m_pLookTarget) {
-		if (m_pLookTarget->IsPed()) {
-			((CPed*)m_pLookTarget)->m_pedIK.GetComponentPosition(lookPos, PED_MID);
-		} else {
-			lookPos = m_pLookTarget->GetPosition();
+		float speedMult = 0.0f;
+		if (buoyancyImpulse.z / m_fMass > GRAVITY * CTimer::GetTimeStep()
+			|| mod_Buoyancy.m_waterlevel > GetPosition().z + 0.6f) {
+			speedMult = pow(0.9f, CTimer::GetTimeStep());
+			m_vecMoveSpeed.x *= speedMult;
+			m_vecMoveSpeed.y *= speedMult;
+			m_vecMoveSpeed.z *= speedMult;
+			bIsStanding = false;
+			bIsDrowning = true;
+			InflictDamage(nil, WEAPONTYPE_DROWNING, 3.0f * CTimer::GetTimeStep(), PEDPIECE_TORSO, 0);
 		}
-
-		if (!m_pedIK.LookAtPosition(lookPos)) {
-			if (!bKeepTryingToLook) {
-				ClearLookFlag();
+		if (buoyancyImpulse.z / m_fMass > GRAVITY * 0.25f * CTimer::GetTimeStep()) {
+			if (speedMult == 0.0f) {
+				speedMult = pow(0.9f, CTimer::GetTimeStep());
 			}
-			return;
-		}
-
-		if (!bShakeFist || bIsAimingGun || bIsRestoringGun)
-			return;
-
-		if (m_nPedState == PED_ANSWER_MOBILE)
-			return;
-
-		if (m_lookTimer - CTimer::GetTimeInMilliseconds() >= 1000)
-			return;
-
-		bool handFreeToMove = false;
-		AnimationId animToPlay = NUM_STD_ANIMS;
-
-		if (!GetWeapon()->IsType2Handed() && GetWeapon()->m_eWeaponType != WEAPONTYPE_ROCKETLAUNCHER)
-			handFreeToMove = true;
-
-		if (IsPlayer() && handFreeToMove) {
-
-			if (m_pLookTarget->IsPed()) {
-#ifdef FIX_BUGS
-				if (m_pedStats->m_temper > 49 || ((CPed*)m_pLookTarget)->m_nPedType == PEDTYPE_COP)
-#else
-				if (m_pedStats->m_temper < 49 || ((CPed*)m_pLookTarget)->m_nPedType == PEDTYPE_COP)
-#endif
-					animToPlay = ANIM_FUCKU;
-				else if(m_pedStats->m_temper < 47)
-					animToPlay = ANIM_FIGHT_PPUNCH;
+			m_vecMoveSpeed.x *= speedMult;
+			m_vecMoveSpeed.y *= speedMult;
+			if (m_vecMoveSpeed.z >= -0.1f) {
+				if (m_vecMoveSpeed.z < -0.04f)
+					m_vecMoveSpeed.z = -0.02f;
 			} else {
-				if (m_pedStats->m_temper > 49 || m_pLookTarget->GetModelIndex() == MI_POLICE)
-					animToPlay = ANIM_FUCKU;
-			}
-		} else if (handFreeToMove && (CGeneral::GetRandomNumber() & 1)) {
-			animToPlay = ANIM_FUCKU;
-		}
-
-		if (animToPlay != NUM_STD_ANIMS) {
-			CAnimBlendAssociation *newAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animToPlay, 4.0f);
+				m_vecMoveSpeed.z = -0.01f;
+				DMAudio.PlayOneShot(m_audioEntityId, SOUND_SPLASH, 0.0f);
+				CVector aBitForward = 2.2f * m_vecMoveSpeed + GetPosition();
+				float level = 0.0f;
+				if (CWaterLevel::GetWaterLevel(aBitForward, &level, false))
+					aBitForward.z = level;
 
-			if (newAssoc) {
-				newAssoc->flags |= ASSOC_FADEOUTWHENDONE;
-				newAssoc->flags |= ASSOC_DELETEFADEDOUT;
+				CParticleObject::AddObject(POBJECT_PED_WATER_SPLASH, aBitForward, CVector(0.0f, 0.0f, 0.1f), 0.0f, 200, color, true);
+				nGenerateRaindrops = CTimer::GetTimeInMilliseconds() + 80;
+				nGenerateWaterCircles = CTimer::GetTimeInMilliseconds() + 100;
 			}
 		}
-		bShakeFist = false;
-	} else if (m_fLookDirection == 999999.0f) {
-		ClearLookFlag();
-	} else if (!m_pedIK.LookInDirection(m_fLookDirection, 0.0f)) {
-		if (!bKeepTryingToLook)
-			ClearLookFlag();
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::Pause(void)
-{
-	m_moved = CVector2D(0.0f, 0.0f);
-	if (CTimer::GetTimeInMilliseconds() > m_leaveCarTimer)
-		ClearPause();
-}
-
-// --MIAMI: Done
-void
-CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
-{
-	CPed *ped = (CPed*)arg;
-
-	CVehicle *veh = ped->m_pMyVehicle;
-	if (animAssoc)
-		animAssoc->blendDelta = -1000.0f;
-
-	if (!ped->IsNotInWreckedVehicle())
-		return;
-
-	if (!ped->EnteringCar()) {
-		if (ped->m_nPedState != PED_DRIVING)
-			ped->QuitEnteringCar();
-
-		return;
-	}
-
-	if (!ped->m_vehEnterType) {
-		ped->QuitEnteringCar();
-		return;
-	}
-
-	if (ped->m_fHealth == 0.0f) {
-		ped->QuitEnteringCar();
-		return;
-	}
-	bool itsVan = !!veh->bIsVan;
-	bool itsBus = !!veh->bIsBus;
-	bool itsLow = !!veh->bLowVehicle;
-	eDoors enterDoor;
-
-	switch (ped->m_vehEnterType) {
-		case CAR_DOOR_RF:
-			itsVan = false;
-			enterDoor = DOOR_FRONT_RIGHT;
-			break;
-		case CAR_DOOR_RR:
-			enterDoor = DOOR_REAR_RIGHT;
-			break;
-		case CAR_DOOR_LF:
-			itsVan = false;
-			enterDoor = DOOR_FRONT_LEFT;
-			break;
-		case CAR_DOOR_LR:
-			enterDoor = DOOR_REAR_LEFT;
-			break;
-		default:
-			break;
-	}
-
-	if (veh->IsBike()) {
-		CPed *pedToDragOut = nil;
-		if (veh->GetStatus() == STATUS_ABANDONED) {
-			if (ped->m_vehEnterType == CAR_WINDSCREEN) {
-				ped->m_pVehicleAnim = CAnimManager::BlendAnimation(ped->GetClump(), ((CBike*)veh)->m_bikeAnimType, ANIM_BIKE_KICK, 6.0f);
-				ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
-				((CBike*)veh)->bIsBeingPickedUp = true;
-
-			} else if (veh->GetRight().z >= 0.5f || veh->GetRight().z <= -0.5f || veh->GetUp().z <= 0.0f) {
-				if (enterDoor == DOOR_FRONT_LEFT || enterDoor == DOOR_REAR_LEFT) {
-					if (veh->GetRight().z > 0.0f)
-						ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_BIKE_PICKUP_R);
-					else
-						ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_BIKE_PULLUP_R);
-
-				} else {
-					if (veh->GetRight().z < 0.0f)
-						ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_BIKE_PICKUP_L);
-					else
-						ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_BIKE_PULLUP_L);
-				}
-				ped->m_pVehicleAnim->SetFinishCallback(PedAnimDoorOpenCB, ped);
-
-			} else {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ((CBike*)veh)->m_bikeAnimType,
-					enterDoor == DOOR_FRONT_LEFT || enterDoor == DOOR_REAR_LEFT ? ANIM_BIKE_JUMPON_R : ANIM_BIKE_JUMPON_L);
-				ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
-				((CBike*)veh)->bIsBeingPickedUp = true;
-			}
-		} else if (ped->m_vehEnterType == CAR_WINDSCREEN) {
-			if (veh->pDriver->m_nPedState != PED_DRIVING || veh->pDriver->bDontDragMeOutCar) {
-				ped->QuitEnteringCar();
-			} else {
-				ped->m_pVehicleAnim = CAnimManager::BlendAnimation(ped->GetClump(), ((CBike*)veh)->m_bikeAnimType, ANIM_BIKE_KICK, 6.0f);
-				ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
-				pedToDragOut = veh->pDriver;
-			}
-			((CBike*)veh)->bIsBeingPickedUp = true;
-		} else {
-			if (enterDoor == DOOR_FRONT_LEFT || enterDoor == DOOR_FRONT_RIGHT) {
-				if (veh->pDriver) {
-					if (veh->m_vecMoveSpeed.Magnitude() > 0.2f) {
-						ped->QuitEnteringCar();
-						ped->SetFall(1000, ped->m_vehEnterType == CAR_DOOR_LF || ped->m_vehEnterType == CAR_DOOR_LR ? ANIM_KO_SPIN_L : ANIM_KO_SPIN_R, false);
-						return;
-					}
-					if (veh->pDriver->m_nPedState != PED_DRIVING || veh->pDriver->bDontDragMeOutCar) {
-						ped->QuitEnteringCar();
-					} else {
-						ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, enterDoor == DOOR_FRONT_LEFT ? ANIM_BIKE_ELBOW_R : ANIM_BIKE_ELBOW_L);
-						ped->m_pVehicleAnim->SetFinishCallback(PedAnimPullPedOutCB, ped);
-						pedToDragOut = veh->pDriver;
-					}
-					((CBike*)veh)->bIsBeingPickedUp = true;
-
-				} else {
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ((CBike*)veh)->m_bikeAnimType, enterDoor == DOOR_FRONT_LEFT ? ANIM_BIKE_JUMPON_R : ANIM_BIKE_JUMPON_L);
-					ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
-					((CBike*)veh)->bIsBeingPickedUp = true;
-				}
-			} else {
-				if (veh->pPassengers[0]) {
-					if (veh->m_vecMoveSpeed.Magnitude() > 0.2f) {
-						ped->QuitEnteringCar();
-						ped->SetFall(1000, ped->m_vehEnterType == CAR_DOOR_LF || ped->m_vehEnterType == CAR_DOOR_LR ? ANIM_KO_SPIN_L : ANIM_KO_SPIN_R, false);
-						return;
-					}
-					if (veh->pPassengers[0]->m_nPedState != PED_DRIVING || veh->pPassengers[0]->bDontDragMeOutCar) {
-						ped->QuitEnteringCar();
-					} else {
-						ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD,
-							enterDoor == DOOR_REAR_LEFT ? ANIM_BIKE_ELBOW_R : ANIM_BIKE_ELBOW_L);
-						ped->m_pVehicleAnim->SetFinishCallback(PedAnimPullPedOutCB, ped);
-						pedToDragOut = veh->pPassengers[0];
-					}
-					((CBike*)veh)->bIsBeingPickedUp = true;
+		if (nGenerateWaterCircles && CTimer::GetTimeInMilliseconds() >= nGenerateWaterCircles) {
+			CVector pos = GetPosition();
+			float level = 0.0f;
+			if (CWaterLevel::GetWaterLevel(pos, &level, false))
+				pos.z = level;
 
-				} else {
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(),
-						((CBike*)veh)->m_bikeAnimType, enterDoor == DOOR_REAR_LEFT ? ANIM_BIKE_JUMPON_R : ANIM_BIKE_JUMPON_L);
-					ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
-					((CBike*)veh)->bIsBeingPickedUp = true;
+			if (pos.z != 0.0f) {
+				nGenerateWaterCircles = 0;
+				for(int i = 0; i < 4; i++) {
+					pos.x += CGeneral::GetRandomNumberInRange(-0.75f, 0.75f);
+					pos.y += CGeneral::GetRandomNumberInRange(-0.75f, 0.75f);
+					CParticle::AddParticle(PARTICLE_RAIN_SPLASH_BIGGROW, pos, CVector(0.0f, 0.0f, 0.0f), nil, 0.0f, color, 0, 0, 0, 0);
 				}
 			}
 		}
+		if (nGenerateRaindrops && CTimer::GetTimeInMilliseconds() >= nGenerateRaindrops) {
+			CVector pos = GetPosition();
+			float level = 0.0f;
+			if (CWaterLevel::GetWaterLevel(pos, &level, false))
+				pos.z = level;
 
-		if (pedToDragOut) {
-			pedToDragOut->SetBeingDraggedFromCar(veh, ped->m_vehEnterType, false);
-			if (pedToDragOut->IsGangMember())
-				pedToDragOut->RegisterThreatWithGangPeds(ped);
-
-			if (ped->m_nPedType == PEDTYPE_COP && pedToDragOut == FindPlayerPed() && veh->IsBike())
-				((CCopPed*)ped)->m_bDragsPlayerFromCar = 1;
-
-			if (pedToDragOut == veh->pDriver) {
-				if (veh->pPassengers[0])
-					veh->pPassengers[0]->SetBeingDraggedFromCar(veh, CAR_DOOR_LR, false);
-			}
-		}
-		return;
-	}
-
-	if (veh->IsDoorMissing(enterDoor) || veh->IsDoorFullyOpen(enterDoor)) {
-
-		veh->AutoPilot.m_nCruiseSpeed = 0;
-		if (ped->m_nPedState == PED_CARJACK || veh->m_nNumMaxPassengers == 0 && veh->pDriver && enterDoor == DOOR_FRONT_RIGHT) {
-			ped->PedAnimDoorOpenCB(nil, ped);
-			return;
-		}
-		if (enterDoor != DOOR_FRONT_LEFT && enterDoor != DOOR_REAR_LEFT) {
-			if (itsVan) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETIN);
-			} else if (itsBus) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_IN_R);
-			} else if (itsLow) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_RHS);
-			} else {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_RHS);
-			}
-		} else if (itsVan) {
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETIN_L);
-		} else if (itsBus) {
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_IN_L);
-		} else if (itsLow) {
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_LHS);
-		} else {
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LHS);
-		}
-		ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
-
-	} else if (veh->CanPedOpenLocks(ped)) {
-
-		veh->AutoPilot.m_nCruiseSpeed = 0;
-		if (enterDoor != DOOR_FRONT_LEFT && enterDoor != DOOR_REAR_LEFT) {
-			if (itsVan) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_OPEN);
-			} else if (itsBus) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_OPEN_R);
-			} else {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_OPEN_RHS);
-			}
-		} else if (itsVan) {
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_OPEN_L);
-		} else if (itsBus) {
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_OPEN_L);
-		} else {
-
-			if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER && veh->pDriver) {
-
-				if (!veh->bLowVehicle
-					&& veh->pDriver->CharCreatedBy != MISSION_CHAR
-					&& veh->pDriver->m_nPedState == PED_DRIVING) {
-
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_QJACK);
-					ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
-
-					CPlayerPed *player = nil;
-					CCopPed *cop = nil;
-					veh->MakeNonDraggedPedsLeaveVehicle(veh->pDriver, ped, player, cop);
-					if (player && cop) {
-						cop->QuitEnteringCar();
-						cop->SetArrestPlayer(player);
-					}
-
-					if (player != veh->pDriver) {
-						veh->pDriver->SetBeingDraggedFromCar(veh, ped->m_vehEnterType, true);
-						if (veh->pDriver->IsGangMember())
-							veh->pDriver->RegisterThreatWithGangPeds(ped);
-					}
-					return;
-				}
-			}
-			if (veh->IsOpenTopCar() && !veh->pDriver && ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_JUMPIN_LHS);
-				ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
-				return;
+			if (pos.z >= 0.0f) {
+				pos.z += 0.25f;
+				nGenerateRaindrops = 0;
+				CParticleObject::AddObject(POBJECT_SPLASHES_AROUND, pos, CVector(0.0f, 0.0f, 0.0f), 4.5f, 1500, CRGBA(0,0,0,0), true);
 			}
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_OPEN_LHS);
 		}
-		ped->m_pVehicleAnim->SetFinishCallback(PedAnimDoorOpenCB, ped);
-
-	} else {
-		if (enterDoor != DOOR_FRONT_LEFT && enterDoor != DOOR_REAR_LEFT)
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_DOORLOCKED_RHS);
-		else
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_DOORLOCKED_LHS);
-
-		ped->bCancelEnteringCar = true;
-		ped->m_pVehicleAnim->SetFinishCallback(PedAnimDoorOpenCB, ped);
-	}
+	} else
+		bTouchingWater = false;
 }
 
 // --MIAMI: Done?
@@ -12161,3541 +2938,526 @@ CPed::ProcessControl(void)
 }
 
 // --MIAMI: Done
-void
-CPed::SetInTheAir(void)
-{
-	if (bIsInTheAir)
-		return;
-
-	bIsInTheAir = true;
-	CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_GLIDE, 4.0f);
-
-	if (m_nPedState == PED_ATTACK) {
-		ClearAttack();
-		ClearPointGunAt();
-	} else if (m_nPedState == PED_FIGHT) {
-		EndFight(ENDFIGHT_FAST);
-	}
-
-}
-
-// --MIAMI: Done
-void
-CPed::RestoreHeadPosition(void)
-{
-	if(!CanUseTorsoWhenLooking())
-		m_pedIK.m_flags |= CPedIK::LOOKAROUND_HEAD_ONLY;
-
-	if (m_pedIK.RestoreLookAt()) {
-		bIsRestoringLook = false;
-		if(CanUseTorsoWhenLooking())
-			m_pedIK.m_flags &= ~CPedIK::LOOKAROUND_HEAD_ONLY;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::PointGunAt(void)
-{
-	CWeaponInfo *weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	float animLoopStart = weaponInfo->m_fAnimLoopStart;
-	CAnimBlendAssociation *weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE);
-	if (!weaponAssoc || weaponAssoc->blendDelta < 0.0f) {
-		if (!!weaponInfo->m_bCrouchFire) {
-			weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weaponInfo));
-			animLoopStart = weaponInfo->m_fAnim2LoopStart;
-		}
-	}
-
-	if (weaponAssoc && weaponAssoc->currentTime > animLoopStart * 0.4f) {
-		weaponAssoc->SetCurrentTime(animLoopStart);
-		weaponAssoc->flags &= ~ASSOC_RUNNING;
-
-		if (bIsDucking)
-			m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
-
-		if (weaponInfo->m_bCanAimWithArm)
-			m_pedIK.m_flags |= CPedIK::AIMS_WITH_ARM;
-		else
-			m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg)
-{
-	CPed *ped = (CPed*)arg;
-
-	CAutomobile *veh = (CAutomobile*)(ped->m_pMyVehicle);
-	
-	if (!ped->IsNotInWreckedVehicle() || ped->DyingOrDead())
-		return;
-
-	if (ped->EnteringCar()) {
-		bool isLow = !!veh->bLowVehicle;
-
-		if (!veh->bIsBus)
-			veh->ProcessOpenDoor(ped->m_vehEnterType, ANIM_CAR_CLOSEDOOR_LHS, 1.0f);
-
-		eDoors door;
-		switch (ped->m_vehEnterType) {
-			case CAR_DOOR_RF: door = DOOR_FRONT_RIGHT; break;
-			case CAR_DOOR_RR: door = DOOR_REAR_RIGHT; break;
-			case CAR_DOOR_LF: door = DOOR_FRONT_LEFT; break;
-			case CAR_DOOR_LR: door = DOOR_REAR_LEFT; break;
-			default: assert(0);
-		}
-
-		if (veh->Damage.GetDoorStatus(door) == DOOR_STATUS_SWINGING)
-			veh->Damage.SetDoorStatus(door, DOOR_STATUS_OK);
-
-		if (door == DOOR_FRONT_LEFT || ped->m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER || veh->bIsBus || veh->m_nNumMaxPassengers == 0) {
-			PedSetInCarCB(nil, ped);
-		} else if (ped->m_vehEnterType == CAR_DOOR_RF
-				&& (veh->m_nGettingInFlags & CAR_DOOR_FLAG_LF ||
-					(veh->pDriver != nil && 
-						(veh->pDriver->m_objective != OBJECTIVE_LEAVE_CAR
-							&& veh->pDriver->m_objective != OBJECTIVE_LEAVE_CAR_AND_DIE
-							|| !veh->IsRoomForPedToLeaveCar(CAR_DOOR_LF, nil))))) {
-
-			if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || ped->m_nPedState == PED_CARJACK)
-				veh->bIsBeingCarJacked = false;
-
-			ped->m_objective = OBJECTIVE_ENTER_CAR_AS_PASSENGER;
-			PedSetInCarCB(nil, ped);
-
-			ped->SetObjective(OBJECTIVE_LEAVE_CAR, veh);
-			if (!ped->IsPlayer())
-				ped->bFleeAfterExitingCar = true;
-
-			ped->bUsePedNodeSeek = true;
-			ped->m_pNextPathNode = nil;
-
-		} else {
-			if (animAssoc)
-				animAssoc->blendDelta = -1000.0f;
-
-			if (isLow)
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_LSHUFFLE_RHS);
-			else
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_SHUFFLE_RHS);
-
-			ped->m_pVehicleAnim->SetFinishCallback(PedSetInCarCB, ped);
-		}
-	} else if (ped->m_nPedState != PED_DRIVING) {
-		ped->QuitEnteringCar();
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::PedAnimDoorCloseRollingCB(CAnimBlendAssociation* animAssoc, void* arg)
-{
-	CPed* ped = (CPed*)arg;
-
-	CAutomobile* veh = (CAutomobile*)(ped->m_pMyVehicle);
-
-	if (animAssoc)
-		animAssoc->blendDelta = -1000.0f;
-
-	if (veh->bLowVehicle) {
-		veh->ProcessOpenDoor(CAR_DOOR_LF, ANIM_CAR_ROLLDOOR_LOW, 1.0f);
-	} else {
-		veh->ProcessOpenDoor(CAR_DOOR_LF, ANIM_CAR_ROLLDOOR, 1.0f);
-	}
-
-	veh->m_nGettingOutFlags &= ~CAR_DOOR_FLAG_LF;
-
-	if (veh->Damage.GetDoorStatus(DOOR_FRONT_LEFT) == DOOR_STATUS_SWINGING)
-		veh->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_OK);
-}
-
-// --MIAMI: Done
-void
-CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
+int32
+CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 {
-	CPed* ped = (CPed*)arg;
-
-	CVehicle* veh = ped->m_pMyVehicle;
-
-	if (animAssoc)
-		animAssoc->blendDelta = -1000.0f;
-
-	if (!ped->IsNotInWreckedVehicle())
-		return;
-
-	if (!ped->EnteringCar()) {
-		if(ped->m_nPedState != PED_DRIVING)
-			ped->QuitEnteringCar();
-
-		return;
-	}
-
-	eDoors door;
-	CPed *pedInSeat = nil;
-	switch (ped->m_vehEnterType) {
-		case CAR_DOOR_RF:
-			door = DOOR_FRONT_RIGHT;
-			pedInSeat = veh->pPassengers[0];
-			if (!veh->pPassengers[0] && ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER)
-				pedInSeat = veh->pDriver;
-			break;
-		case CAR_DOOR_RR:
-			door = DOOR_REAR_RIGHT;
-			pedInSeat = veh->pPassengers[2];
-			break;
-		case CAR_DOOR_LF:
-			door = DOOR_FRONT_LEFT;
-			pedInSeat = veh->pDriver;
-			if (veh->bIsBus && ped->m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER)
-				pedInSeat = nil;
-			break;
-		case CAR_DOOR_LR:
-			door = DOOR_REAR_LEFT;
-			pedInSeat = veh->pPassengers[1];
-			break;
-		default: assert(0);
-	}
-
-	if (ped->m_fHealth == 0.0f || CPad::GetPad(0)->ArePlayerControlsDisabled() && pedInSeat && pedInSeat->IsPlayer()) {
-		ped->QuitEnteringCar();
-		return;
-	}
-
-	bool isVan = veh->bIsVan;
-	bool isBus = veh->bIsBus;
-	bool isLow = veh->bLowVehicle;
-	bool vehUpsideDown = veh->IsUpsideDown();
-	if (ped->bCancelEnteringCar) {
-		if (ped->IsPlayer()) {
-			if (veh->pDriver) {
-				if (veh->pDriver->m_nPedType == PEDTYPE_COP) {
-					FindPlayerPed()->SetWantedLevelNoDrop(1);
-				}
-			}
-		}
-#ifdef CANCELLABLE_CAR_ENTER
-		if (!veh->IsDoorMissing(door) && veh->CanPedOpenLocks(ped) && veh->IsCar()) {
-			((CAutomobile*)veh)->Damage.SetDoorStatus(door, DOOR_STATUS_SWINGING);
-		}
-#endif
-		ped->QuitEnteringCar();
-		ped->RestorePreviousObjective();
-		ped->bCancelEnteringCar = false;
-		return;
-	}
-	if (!veh->IsDoorMissing(door) && veh->IsCar()) {
-		((CAutomobile*)veh)->Damage.SetDoorStatus(door, DOOR_STATUS_SWINGING);
-	}
+	bool collidedWithBoat = false;
+	bool belowTorsoCollided = false;
+	float gravityEffect = -0.15f * CTimer::GetTimeStep();
+	CColPoint intersectionPoint;
+	CColLine ourLine;
 
-	if (veh->m_vecMoveSpeed.Magnitude() > 0.2f ||
-		veh->IsCar() && veh->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI && ((CAutomobile*)veh)->m_nWheelsOnGround == 0) {
-		ped->QuitEnteringCar();
-		if (ped->m_vehEnterType != CAR_DOOR_LF && ped->m_vehEnterType != CAR_DOOR_LR)
-			ped->SetFall(1000, ANIM_KO_SPIN_R, false);
-		else
-			ped->SetFall(1000, ANIM_KO_SPIN_L, false);
-		
-		return;
-	}
-	veh->ProcessOpenDoor(ped->m_vehEnterType, ANIM_CAR_OPEN_LHS, 1.0f);
+	CColModel *ourCol = CModelInfo::GetModelInfo(GetModelIndex())->GetColModel();
+	CColModel *hisCol = CModelInfo::GetModelInfo(collidingEnt->GetModelIndex())->GetColModel();
 
-	if (ped->m_vehEnterType == CAR_DOOR_LF || ped->m_vehEnterType == CAR_DOOR_RF)
-		isVan = false;
+	if (!bUsesCollision && !bJustCheckCollision)
+		return false;
 
-	if (ped->m_nPedState != PED_CARJACK || isBus) {
+	if (collidingEnt->IsVehicle() && ((CVehicle*)collidingEnt)->IsBoat())
+		collidedWithBoat = true;
 
-		if (ped->m_vehEnterType == CAR_DOOR_LF || ped->m_vehEnterType == CAR_DOOR_LR) {
-			if (veh->IsBike()) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ((CBike*)veh)->m_bikeAnimType, ANIM_BIKE_JUMPON_R);
-			} else if (isVan) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETIN_L);
-			} else if (isBus) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_IN_L);
-			} else if (isLow) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_LHS);
-			} else {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LHS);
+	// ofc we're not vehicle
+	if (!m_bIsVehicleBeingShifted && !bSkipLineCol && !collidingEnt->IsPed()) {
+		if (!bCollisionProcessed) {
+			m_pCurrentPhysSurface = nil;
+			if (bIsStanding) {
+				bIsStanding = false;
+				bWasStanding = true;
 			}
-		} else {
-			if (veh->IsBike()) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ((CBike*)veh)->m_bikeAnimType, ANIM_BIKE_JUMPON_L);
-			} else if (isVan) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETIN);
-			} else if (isBus) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_IN_R);
-			} else if (isLow) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_RHS);
+			bCollisionProcessed = true;
+			m_fCollisionSpeed += m_vecMoveSpeed.Magnitude2D() * CTimer::GetTimeStep();
+			bStillOnValidPoly = false;
+			if (IsPlayer() || m_fCollisionSpeed >= 1.0f
+				&& (m_fCollisionSpeed >= 2.0f || m_nPedState != PED_WANDER_PATH)) {
+				m_collPoly.valid = false;
+				m_fCollisionSpeed = 0.0f;
+				bHitSteepSlope = false;
 			} else {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_RHS);
-			}
-
-			if (ped->m_vehEnterType == CAR_DOOR_RF && pedInSeat && veh->IsCar())
-				pedInSeat->SetObjective(OBJECTIVE_LEAVE_CAR, veh);
-		}
-		
-		ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
-	} else {
-		CPed *pedToDragOut = nil;
-		switch (ped->m_vehEnterType) {
-			case CAR_DOOR_RF: pedToDragOut = veh->pPassengers[0]; break;
-			case CAR_DOOR_RR: pedToDragOut = veh->pPassengers[2]; break;
-			case CAR_DOOR_LF: pedToDragOut = veh->pDriver; break;
-			case CAR_DOOR_LR: pedToDragOut = veh->pPassengers[1]; break;
-			default: assert(0);
-		}
-
-		if (vehUpsideDown) {
-			ped->QuitEnteringCar();
-			if (ped->m_nPedType == PEDTYPE_COP)
-				((CCopPed*)ped)->SetArrestPlayer(ped->m_pedInObjective);
-		}
-
-		if (ped->m_vehEnterType != CAR_DOOR_LF && ped->m_vehEnterType != CAR_DOOR_LR) {
-
-			if (pedToDragOut && !pedToDragOut->bDontDragMeOutCar) {
-				if (pedToDragOut->m_nPedState != PED_DRIVING) {
-					ped->QuitEnteringCar();
-					pedToDragOut = nil;
-				} else {
-					if (isLow)
-						ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_PULLOUT_LOW_RHS);
-					else
-						ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_PULLOUT_RHS);
-
-					ped->m_pVehicleAnim->SetFinishCallback(PedAnimPullPedOutCB, ped);
+				CVector pos = GetPosition();
+				float potentialGroundZ = GetPosition().z - FEET_OFFSET;
+				if (bWasStanding) {
+					pos.z += -0.25f;
+					potentialGroundZ += gravityEffect;
 				}
-			} else if (ped->m_nPedType == PEDTYPE_COP) {
-				ped->QuitEnteringCar();
-				if (ped->m_pedInObjective && ped->m_pedInObjective->m_nPedState == PED_DRIVING) {
-					veh->SetStatus(STATUS_PLAYER_DISABLED);
-
-					if (ped->m_pedInObjective->IsPlayer()) {
-						((CCopPed*)ped)->SetArrestPlayer(ped->m_pedInObjective);
-					} else {
-						ped->ClearObjective();
-						ped->SetWanderPath(CGeneral::GetRandomNumberInRange(0.f, 8.f));
+				if (CCollision::IsStoredPolyStillValidVerticalLine(pos, potentialGroundZ, intersectionPoint, &m_collPoly)) {
+					bStillOnValidPoly = true;
+					if(!bHeadStuckInCollision || FEET_OFFSET + intersectionPoint.point.z < GetPosition().z) {
+						GetMatrix().GetPosition().z = FEET_OFFSET + intersectionPoint.point.z;
+						if (bHeadStuckInCollision)
+							bHeadStuckInCollision = false;
 					}
-
-				} else if (!veh->IsDoorMissing(DOOR_FRONT_RIGHT)) {
-					((CAutomobile*)veh)->Damage.SetDoorStatus(DOOR_FRONT_RIGHT, DOOR_STATUS_SWINGING);
+					m_vecMoveSpeed.z = 0.0f;
+					bIsStanding = true;
+				} else {
+					m_collPoly.valid = false;
+					m_fCollisionSpeed = 0.0f;
+					bHitSteepSlope = false;
 				}
-			} else {
-				if (isLow)
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_RHS);
-				else
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_RHS);
-
-				ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
-			}
-		} else if (pedToDragOut) {
-
-			if (pedToDragOut->m_nPedState != PED_DRIVING || pedToDragOut->bDontDragMeOutCar) {
-				ped->QuitEnteringCar();
-				pedToDragOut = nil;
-			} else {
-				if (isLow)
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_PULLOUT_LOW_LHS);
-				else
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_PULLOUT_LHS);
-					
-				ped->m_pVehicleAnim->SetFinishCallback(PedAnimPullPedOutCB, ped);
 			}
-		} else {
-			if (isLow)
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_LHS);
-			else
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LHS);
-
-			ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
 		}
 
-		if (pedToDragOut) {
-			CPlayerPed* player = nil;
-			CCopPed* cop = nil;
-			veh->MakeNonDraggedPedsLeaveVehicle(pedToDragOut, ped, player, cop);
-			if (player && cop) {
-				cop->QuitEnteringCar();
-				veh->SetStatus(STATUS_PLAYER_DISABLED);
-				cop->SetArrestPlayer(player);
-			}
+		if (!bStillOnValidPoly) {
+			CVector potentialCenter = GetPosition();
+			potentialCenter.z = GetPosition().z - 0.52f;
 
-			if (player != pedToDragOut) {
-				pedToDragOut->SetBeingDraggedFromCar(veh, ped->m_vehEnterType, false);
-				if (pedToDragOut->IsGangMember())
-					pedToDragOut->RegisterThreatWithGangPeds(ped);
+			// 0.52f should be a ped's approx. radius
+			float totalRadiusWhenCollided = collidingEnt->GetBoundRadius() + 0.52f - gravityEffect;
+			if (bWasStanding) {
+				if (collidedWithBoat) {
+					potentialCenter.z += 2.0f * gravityEffect;
+					totalRadiusWhenCollided += Abs(gravityEffect);
+				} else {
+					potentialCenter.z += gravityEffect;
+				}
 			}
-		}
-	}
-	return;
-}
-
-// --MIAMI: Done
-void
-CPed::SetJump(void)
-{
-	if (!bInVehicle && m_nPedState != PED_JUMP && !RpAnimBlendClumpGetAssociation(GetClump(), ANIM_JUMP_LAUNCH) &&
-		(m_nSurfaceTouched != SURFACE_STEEP_CLIFF || DotProduct(GetForward(), m_vecDamageNormal) >= 0.0f)) {
+			if (sq(totalRadiusWhenCollided) > (potentialCenter - collidingEnt->GetBoundCentre()).MagnitudeSqr()) {
+				ourLine.p0 = GetPosition();
+				ourLine.p1 = GetPosition();
+				ourLine.p1.z = GetPosition().z - FEET_OFFSET;
+				if (bWasStanding) {
+					ourLine.p1.z = ourLine.p1.z + gravityEffect;
+					ourLine.p0.z = ourLine.p0.z + -0.25f;
+				}
+				float minDist = 1.0f;
+				belowTorsoCollided = CCollision::ProcessVerticalLine(ourLine, collidingEnt->GetMatrix(), *hisCol,
+					intersectionPoint, minDist, false, false, &m_collPoly);
 
-		SetStoredState();
-		SetPedState(PED_JUMP);
-		CAnimBlendAssociation *jumpAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_JUMP_LAUNCH, 8.0f);
-		jumpAssoc->SetFinishCallback(FinishLaunchCB, this);
-		m_fRotationDest = m_fRotationCur;
-	}
-}
+				if (collidedWithBoat && bWasStanding && !belowTorsoCollided) {
+					ourLine.p0.z = ourLine.p1.z;
+					ourLine.p1.z = ourLine.p1.z + gravityEffect;
+					belowTorsoCollided = CCollision::ProcessVerticalLine(ourLine, collidingEnt->GetMatrix(), *hisCol,
+						intersectionPoint, minDist, false, false, &m_collPoly);
+				}
+				if (belowTorsoCollided) {
+						if (!bIsStanding
+							|| FEET_OFFSET + intersectionPoint.point.z > GetPosition().z
+							|| collidedWithBoat && 3.12f + intersectionPoint.point.z > GetPosition().z) {
 
-// --MIAMI: Done
-void
-CPed::RemoveInCarAnims(void)
-{
-	CAnimBlendAssociation* assoc;
+							if (!collidingEnt->IsVehicle() && !collidingEnt->IsObject()) {
+								m_pCurSurface = collidingEnt;
+								collidingEnt->RegisterReference((CEntity**)&m_pCurSurface);
+								bTryingToReachDryLand = false;
+								bOnBoat = false;
+							} else {
+								m_pCurrentPhysSurface = (CPhysical*)collidingEnt;
+								collidingEnt->RegisterReference((CEntity**)&m_pCurrentPhysSurface);
+								m_vecOffsetFromPhysSurface = intersectionPoint.point - collidingEnt->GetPosition();
+								m_pCurSurface = collidingEnt;
+								collidingEnt->RegisterReference((CEntity**)&m_pCurSurface);
+								m_collPoly.valid = false;
+								if (collidingEnt->IsVehicle() && ((CVehicle*)collidingEnt)->IsBoat()) {
+									bOnBoat = true;
+								} else {
+									bOnBoat = false;
+								}
+							}
 
-	for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_DRIVING); assoc;
-		assoc = RpAnimBlendGetNextAssociation(assoc, ASSOC_DRIVING)) {
-		assoc->flags |= ASSOC_DELETEFADEDOUT;
-		assoc->blendDelta = -1000.0f;
-	}
-}
+							if (!bHeadStuckInCollision || FEET_OFFSET + intersectionPoint.point.z < GetPosition().z) {
+								GetMatrix().GetPosition().z = FEET_OFFSET + intersectionPoint.point.z;
+								if (bHeadStuckInCollision)
+									bHeadStuckInCollision = false;
+							}
+							m_nSurfaceTouched = intersectionPoint.surfaceB;
+							if (m_nSurfaceTouched == SURFACE_STEEP_CLIFF) {
+								bHitSteepSlope = true;
+								m_vecDamageNormal = intersectionPoint.normal;
+							}
+						}
 
-// --MIAMI: Done
-void
-CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
-{
-	CPed *ped = (CPed*) arg;
+						float upperSpeedLimit = 0.33f;
+						float lowerSpeedLimit = -0.25f;
+						float speed = m_vecMoveSpeed.Magnitude2D();
+						if (m_nPedState == PED_IDLE) {
+							upperSpeedLimit *= 2.0f;
+							lowerSpeedLimit *= 1.5f;
+						}
+						CAnimBlendAssociation *fallAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FALL);
+						if (!bWasStanding && speed > upperSpeedLimit && (!bPushedAlongByCar || m_vecMoveSpeed.z < lowerSpeedLimit)
+							&& m_pCollidingEntity != collidingEnt) {
 
-	CVehicle *veh = ped->m_pMyVehicle;
-	if (animAssoc)
-		animAssoc->blendDelta = -1000.0f;
+							float damage = 100.0f * Max(speed - 0.25f, 0.0f);
+							float damage2 = damage;
+							if (m_vecMoveSpeed.z < -0.25f)
+								damage += (-0.25f - m_vecMoveSpeed.z) * 150.0f;
 
-	if (!ped->IsNotInWreckedVehicle() || ped->DyingOrDead())
-		return;
+							uint8 dir = 2; // from backward
+							if (m_vecMoveSpeed.x > 0.01f || m_vecMoveSpeed.x < -0.01f || m_vecMoveSpeed.y > 0.01f || m_vecMoveSpeed.y < -0.01f) {
+								CVector2D offset = -m_vecMoveSpeed;
+								dir = GetLocalDirection(offset);
+							}
+							if (CSurfaceTable::IsSoftLanding(intersectionPoint.surfaceB))
+								damage *= 0.5f;
 
-	if (!ped->EnteringCar()) {
-		if(ped->m_nPedState != PED_DRIVING)
-			ped->QuitEnteringCar();
-		return;
-	}
+							InflictDamage(collidingEnt, WEAPONTYPE_FALL, damage, PEDPIECE_TORSO, dir);
+							if (IsPlayer() && damage2 > 5.0f)
+								Say(SOUND_PED_LAND);
 
-	ped->RemoveWeaponWhenEnteringVehicle();
-	if (ped->IsPlayer() && ped->bGonnaKillTheCarJacker && ((CPlayerPed*)ped)->m_pArrestingCop) {
-		PedSetInCarCB(nil, ped);
-		ped->m_nLastPedState = ped->m_nPedState;
-		ped->SetPedState(PED_ARRESTED);
-		ped->bGonnaKillTheCarJacker = false;
-		if (veh) {
-			veh->m_nNumGettingIn = 0;
-			veh->m_nGettingInFlags = 0;	
-			veh->bIsHandbrakeOn = true;
-			veh->SetStatus(STATUS_PLAYER_DISABLED);
+						} else if (!bWasStanding && fallAnim && -0.016f * CTimer::GetTimeStep() > m_vecMoveSpeed.z) {
+							InflictDamage(collidingEnt, WEAPONTYPE_FALL, 15.0f, PEDPIECE_TORSO, 2);
+						}
+						m_vecMoveSpeed.z = 0.0f;
+						bIsStanding = true;
+				} else {
+					bOnBoat = false;
+				}
+			}
 		}
-		return;
-	}
-	if (ped->IsPlayer() && ped->m_vehEnterType == CAR_DOOR_LF
-		&& (Pads[0].GetAccelerate() >= 255.0f || Pads[0].GetBrake() >= 255.0f)
-		&& veh->IsCar() && !veh->pDriver) {
-
-		if (!animAssoc || animAssoc->animId != ANIM_CAR_JUMPIN_LHS)
-		if (((CAutomobile*)veh)->Damage.GetDoorStatus(DOOR_FRONT_LEFT) != DOOR_STATUS_MISSING)
-			((CAutomobile*)veh)->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_SWINGING);
-
-		PedSetInCarCB(nil, ped);
-		return;
-	}
-	if (veh->IsBike()) {
-		ped->PedSetInCarCB(nil, ped);
-		return;
-	}
-	bool isVan = !!veh->bIsVan;
-	bool isBus = !!veh->bIsBus;
-	bool isLow = !!veh->bLowVehicle;
-	eDoors enterDoor;
-	switch (ped->m_vehEnterType) {
-		case CAR_DOOR_RF:
-			isVan = false;
-			enterDoor = DOOR_FRONT_RIGHT;
-			break;
-		case CAR_DOOR_RR:
-			enterDoor = DOOR_REAR_RIGHT;
-			break;
-		case CAR_DOOR_LF:
-			isVan = false;
-			enterDoor = DOOR_FRONT_LEFT;
-			break;
-		case CAR_DOOR_LR:
-			enterDoor = DOOR_REAR_LEFT;
-			break;
-		default:
-			break;
 	}
-	bool doorClosed = true;
-	if (veh->IsOpenTopCar() && enterDoor == DOOR_FRONT_LEFT && veh->IsDoorClosed(DOOR_FRONT_LEFT)) {
-		doorClosed = false;
 
-	} else if (!veh->IsDoorMissing(enterDoor)) {
-		if (veh->IsCar())
-			((CAutomobile*)veh)->Damage.SetDoorStatus(enterDoor, DOOR_STATUS_SWINGING);
-	}
+	int ourCollidedSpheres = CCollision::ProcessColModels(GetMatrix(), *ourCol, collidingEnt->GetMatrix(), *hisCol, collidingPoints, nil, nil);
+	if (ourCollidedSpheres > 0 || belowTorsoCollided) {
+		AddCollisionRecord(collidingEnt);
+		if (!collidingEnt->IsBuilding())
+			((CPhysical*)collidingEnt)->AddCollisionRecord(this);
 
-	CPed *driver = veh->pDriver;
-	if (driver && (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || ped->m_nPedState == PED_CARJACK)) {
-		if (veh->bIsBus) {
-			driver->SetObjective(OBJECTIVE_LEAVE_CAR, veh);
-			if (driver->IsPlayer()) {
-				veh->bIsHandbrakeOn = true;
-				veh->SetStatus(STATUS_PLAYER_DISABLED);
-			}
-			driver->bBusJacked = true;
-			veh->bIsBeingCarJacked = false;
-			PedSetInCarCB(nil, ped);
-			if (ped->m_nPedType == PEDTYPE_COP
-				|| ped->m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT
-				|| ped->m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS) {
-				ped->SetObjective(OBJECTIVE_LEAVE_CAR, veh);
-			}
-			ped->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 400;
-			return;
+		if (ourCollidedSpheres > 0 && (collidingEnt->IsBuilding() || collidingEnt->GetIsStatic())) {
+			bHasHitWall = true;
 		}
-		if (driver != ped && ped->m_vehEnterType != CAR_DOOR_LF) {
-			if (!driver->IsPlayer()) {
-				driver->bUsePedNodeSeek = true;
-				driver->m_pLastPathNode = nil;
-				if (driver->m_pedStats->m_temper <= driver->m_pedStats->m_fear
-					|| driver->CharCreatedBy == MISSION_CHAR
-					|| veh->VehicleCreatedBy == MISSION_VEHICLE) {
-					driver->bFleeAfterExitingCar = true;
-				} else {
-					driver->bGonnaKillTheCarJacker = true;
-					veh->pDriver->SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, ped);
-
-					if (veh->pDriver->m_nPedType == PEDTYPE_COP && ped->IsPlayer()) {
-						FindPlayerPed()->SetWantedLevelNoDrop(1);
+	}
+	if (collidingEnt->IsBuilding() || collidingEnt->GetIsStatic()) {
+		if (bWasStanding) {
+			CVector sphereNormal;
+			float normalLength;
+			for(int sphere = 0; sphere < ourCollidedSpheres; sphere++) {
+				sphereNormal = collidingPoints[sphere].normal;
+				if (sphereNormal.z >= -1.0f || !IsPlayer()) {
+					normalLength = sphereNormal.Magnitude2D();
+					if (normalLength != 0.0f) {
+						sphereNormal.x = sphereNormal.x / normalLength;
+						sphereNormal.y = sphereNormal.y / normalLength;
 					}
+				} else {
+					float speed = m_vecMoveSpeed.Magnitude2D();
+					sphereNormal.x = -m_vecMoveSpeed.x / Max(0.001f, speed);
+					sphereNormal.y = -m_vecMoveSpeed.y / Max(0.001f, speed);
+					GetMatrix().GetPosition().z -= 0.05f;
+					bHeadStuckInCollision = true;
 				}
+				sphereNormal.Normalise();
+				collidingPoints[sphere].normal = sphereNormal;
+				if (collidingPoints[sphere].surfaceB == SURFACE_STEEP_CLIFF)
+					bHitSteepSlope = true;
 			}
-			if ((ped->m_nPedType != PEDTYPE_EMERGENCY || veh->pDriver->m_nPedType != PEDTYPE_EMERGENCY)
-				&& (ped->m_nPedType != PEDTYPE_COP || veh->pDriver->m_nPedType != PEDTYPE_COP)) {
-				veh->pDriver->SetObjective(OBJECTIVE_LEAVE_CAR, veh);
-				veh->pDriver->Say(SOUND_PED_CAR_JACKED);
-				veh->pDriver->SetRadioStation();
-				if (veh->m_nDoorLock == CARLOCK_UNLOCKED)
-					ped->Say(SOUND_PED_CAR_JACKING);
-
-			} else {
-				ped->m_objective = OBJECTIVE_ENTER_CAR_AS_PASSENGER;
-			}
-		}
-	}
-	if (veh->IsDoorMissing(enterDoor) || !doorClosed || isBus) {
-		PedAnimDoorCloseCB(nil, ped);
-	} else {
-		if (enterDoor != DOOR_FRONT_LEFT && enterDoor != DOOR_REAR_LEFT) {
-			if (isVan) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_CLOSE);
-			} else if (isLow) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSEDOOR_LOW_RHS);
-			} else {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSEDOOR_RHS);
-			}
-		} else if (isVan) {
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_CLOSE_L);
-		} else if (isLow) {
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSEDOOR_LOW_LHS);
-		} else {
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSEDOOR_LHS);
 		}
-		ped->m_pVehicleAnim->SetFinishCallback(PedAnimDoorCloseCB, ped);
 	}
+	return ourCollidedSpheres;
 }
 
-#ifdef GTA_TRAIN
-void
-CPed::SetPedPositionInTrain(void)
-{
-	LineUpPedWithTrain();
-}
-#endif
-
 // --MIAMI: Done
-void
-CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
+static void
+particleProduceFootSplash(CPed *ped, CVector const &pos, float size, int times)
 {
-	CPed* ped = (CPed*)arg;
-
-	CVehicle* veh = ped->m_pMyVehicle;
-	if (animAssoc)
-		animAssoc->blendDelta = -1000.0f;
-
-	if (ped->EnteringCar()) {
-		if (!ped->IsNotInWreckedVehicle())
-			return;
-
-#ifdef CANCELLABLE_CAR_ENTER
-		if (ped->bCancelEnteringCar) {
-			ped->QuitEnteringCar();
-			ped->RestorePreviousObjective();
-			ped->bCancelEnteringCar = false;
-			return;
-		}
-#endif
-
-		bool isLow = !!veh->bLowVehicle;
-
-		int padNo;
-		if (ped->IsPlayer()) {
-
-			// BUG? This will cause crash if m_nPedType is bigger then 1, there are only 2 pads
-			switch (ped->m_nPedType) {
-				case PEDTYPE_PLAYER1:
-					padNo = 0;
-					break;
-				case PEDTYPE_PLAYER2:
-					padNo = 1;
-					break;
-				case PEDTYPE_PLAYER3:
-					padNo = 2;
-					break;
-				case PEDTYPE_PLAYER4:
-					padNo = 3;
-					break;
-			}
-			CPad *pad = CPad::GetPad(padNo);
-
-			if (!pad->ArePlayerControlsDisabled()) {
-
-				if (pad->GetTarget()
-					|| pad->NewState.LeftStickX
-					|| pad->NewState.LeftStickY
-					|| pad->NewState.DPadUp
-					|| pad->NewState.DPadDown
-					|| pad->NewState.DPadLeft
-					|| pad->NewState.DPadRight) {
-					ped->QuitEnteringCar();
-					ped->RestorePreviousObjective();
-					return;
-				}
-			}
-		}
+	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);
 
-		if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
-			if (ped->m_vehEnterType == CAR_DOOR_LF || ped->m_vehEnterType == CAR_DOOR_LR) {
-				if (veh->IsBike())
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ((CBike*)veh)->m_bikeAnimType, ANIM_BIKE_JUMPON_R);
-				else if (isLow)
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_LHS);
-				else
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LHS);
-			} else {
-				if (veh->IsBike())
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ((CBike*)veh)->m_bikeAnimType, ANIM_BIKE_JUMPON_L);
-				else if (isLow)
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_RHS);
-				else
-					ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_RHS);
-			}
-			ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
-		} else {
-			ped->QuitEnteringCar();
-		}
-	} else if(ped->m_nPedState != PED_DRIVING) {
-		ped->QuitEnteringCar();
+		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);
 	}
 }
 
 // --MIAMI: Done
-void
-CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
+static void
+particleProduceFootDust(CPed *ped, CVector const &pos, float size, int times)
 {
-	CPed* ped = (CPed*)arg;
-
-	CVehicle* veh = ped->m_pMyVehicle;
-	if (animAssoc) {
-		if ((animAssoc->animId == ANIM_CAR_ROLLOUT_LHS || animAssoc->animId == ANIM_CAR_ROLLOUT_RHS) && ped && ped->m_nPedState == PED_FALL) {
-			ped->RestoreHeadingRate();
-			return;
-		}
-		animAssoc->blendDelta = -1000.0f;
-		if (animAssoc->animId == ANIM_BIKE_GETOFF_BACK)
-			ped->RestoreHeadingRate();
-	}
-
-	if (!veh) {
-		PedSetOutCarCB(nil, ped);
-		return;
-	}
-	CVector posForZ = ped->GetPosition();
-	CPedPlacement::FindZCoorForPed(&posForZ);
-	if (ped->GetPosition().z - 0.5f > posForZ.z) {
-		PedSetOutCarCB(nil, ped);
-		return;
-	}
-
-	veh->m_nStaticFrames = 0;
-	veh->m_vecMoveSpeed += CVector(0.001f, 0.001f, 0.001f);
-	veh->m_vecTurnSpeed += CVector(0.001f, 0.001f, 0.001f);
-	if (!veh->bIsBus)
-		veh->ProcessOpenDoor(ped->m_vehEnterType, ANIM_CAR_GETOUT_LHS, 1.0f);
-
-	/* 
-	// Duplicate and only in PC for some reason
-	if (!veh) {
-		PedSetOutCarCB(nil, ped);
-		return;
-	}
-	*/
-	eDoors door;
-	switch (ped->m_vehEnterType) {
-		case CAR_DOOR_RF:
-			door = DOOR_FRONT_RIGHT;
-			break;
-		case CAR_DOOR_RR:
-			door = DOOR_REAR_RIGHT;
-			break;
-		case CAR_DOOR_LF:
-			door = DOOR_FRONT_LEFT;
-			break;
-		case CAR_DOOR_LR:
-			door = DOOR_REAR_LEFT;
+	switch (ped->m_nSurfaceTouched)
+	{
+		case SURFACE_TARMAC:
+		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;
 		default:
 			break;
 	}
-	bool closeDoor = !veh->IsDoorMissing(door);
-
-	int padNo;
-	if (ped->IsPlayer()) {
-
-		// BUG? This will cause crash if m_nPedType is bigger then 1, there are only 2 pads
-		switch (ped->m_nPedType) {
-			case PEDTYPE_PLAYER1:
-				padNo = 0;
-				break;
-			case PEDTYPE_PLAYER2:
-				padNo = 1;
-				break;
-			case PEDTYPE_PLAYER3:
-				padNo = 2;
-				break;
-			case PEDTYPE_PLAYER4:
-				padNo = 3;
-				break;
-		}
-		CPad* pad = CPad::GetPad(padNo);
-		bool engineIsIntact = veh->IsCar() && ((CAutomobile*)veh)->Damage.GetEngineStatus() >= 225;
-		if (!pad->ArePlayerControlsDisabled() && veh->m_nDoorLock != CARLOCK_FORCE_SHUT_DOORS
-			&& (pad->GetTarget()
-				|| pad->NewState.LeftStickX
-				|| pad->NewState.LeftStickY
-				|| pad->NewState.DPadUp
-				|| pad->NewState.DPadDown
-				|| pad->NewState.DPadLeft
-				|| pad->NewState.DPadRight)
-			|| veh->bIsBus
-			|| veh->m_pCarFire
-			|| engineIsIntact) {
-			closeDoor = false;
-		}
-	}
-
-	if (ped->m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE)
-		closeDoor = false;
-
-	if (!closeDoor) {
-		if (!veh->IsDoorMissing(door) && !veh->bIsBus) {
-			((CAutomobile*)veh)->Damage.SetDoorStatus(door, DOOR_STATUS_SWINGING);
-		}
-		PedSetOutCarCB(nil, ped);
-		return;
-	}
-
-	if (ped->bFleeAfterExitingCar || ped->bGonnaKillTheCarJacker) {
-		// POTENTIAL BUG? Why DOOR_FRONT_LEFT instead of door variable? or vice versa?
-		if (!veh->IsDoorMissing(door))
-			((CAutomobile*)veh)->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_SWINGING);
-	} else {
-		switch (door) {
-			case DOOR_FRONT_LEFT:
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSE_LHS);
-				break;
-			case DOOR_FRONT_RIGHT:
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSE_RHS);
-				break;
-			case DOOR_REAR_LEFT:
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSE_LHS);
-				break;
-			case DOOR_REAR_RIGHT:
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSE_RHS);
-				break;
-			default:
-				break;
-		}
-	}
-
-	if (ped->m_pVehicleAnim)
-		ped->m_pVehicleAnim->SetFinishCallback(PedSetOutCarCB, ped);
-	return;
 }
 
 // --MIAMI: Done
 void
-CPed::PedEvadeCB(CAnimBlendAssociation* animAssoc, void* arg)
-{
-	CPed* ped = (CPed*)arg;
-
-	if (!animAssoc) {
-		ped->ClearLookFlag();
-		if (ped->m_nPedState == PED_DIVE_AWAY || ped->m_nPedState == PED_STEP_AWAY)
-			ped->RestorePreviousState();
-
-	} else if (animAssoc->animId == ANIM_EV_DIVE) {
-		ped->bUpdateAnimHeading = true;
-		ped->ClearLookFlag();
-		if (ped->m_nPedState == PED_DIVE_AWAY) {
-			ped->m_getUpTimer = CTimer::GetTimeInMilliseconds() + 1;
-			ped->SetPedState(PED_FALL);
-		}
-		animAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
-		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-
-	} else if (animAssoc->flags & ASSOC_FADEOUTWHENDONE) {
-		ped->ClearLookFlag();
-		if (ped->m_nPedState == PED_DIVE_AWAY || ped->m_nPedState == PED_STEP_AWAY)
-			ped->RestorePreviousState();
-
-	} else if (ped->m_nPedState != PED_ARRESTED) {
-		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-		if (animAssoc->blendDelta >= 0.0f)
-			animAssoc->blendDelta = -4.0f;
-
-		ped->ClearLookFlag();
-		if (ped->m_nPedState == PED_DIVE_AWAY || ped->m_nPedState == PED_STEP_AWAY) {
-			ped->RestorePreviousState();
-		}
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::PedGetupCB(CAnimBlendAssociation* animAssoc, void* arg)
-{
-	CPed* ped = (CPed*)arg;
-
-	if (ped->m_nPedState == PED_GETUP)
-		RpAnimBlendClumpSetBlendDeltas(ped->GetClump(), ASSOC_PARTIAL, -1000.0f);
-
-	ped->bFallenDown = false;
-	animAssoc->blendDelta = -1000.0f;
-	if (ped->m_nPedState == PED_GETUP)
-		ped->RestorePreviousState();
-
-	if (ped->bFleeWhenStanding && ped->m_threatEx) {
-		ped->SetFlee(ped->m_threatEx, 10000);
-		ped->Say(SOUND_PED_FLEE_SPRINT);
-		ped->bFleeWhenStanding = false;
-		ped->m_threatEx = nil;
-
-	} else if (ped->bGotUpOfMyOwnAccord) {
-		ped->SetObjective(OBJECTIVE_NONE);
-		ped->SetWanderPath(CGeneral::GetRandomNumberInRange(0.f, 8.f));
-		ped->bGotUpOfMyOwnAccord = false;
-
-	} else {
-		if (ped->m_nPedState != PED_FLEE_POS && ped->m_nPedState != PED_FLEE_ENTITY)
-			ped->SetMoveState(PEDMOVE_STILL);
-		else
-			ped->SetMoveState(PEDMOVE_RUN);
-		ped->SetMoveAnim();
-	}
-
-	ped->bGetUpAnimStarted = false;
-}
-
-// --MIAMI: Done
-void
-CPed::PedLandCB(CAnimBlendAssociation* animAssoc, void* arg)
+CPed::PlayFootSteps(void)
 {
-	CPed* ped = (CPed*)arg;
-
-	animAssoc->blendDelta = -1000.0f;
-	ped->bIsLanding = false;
-
-	if (ped->m_nPedState == PED_JUMP)
-		ped->RestorePreviousState();
-}
+	CAnimBlendAssociation *assoc = RpAnimBlendClumpGetFirstAssociation(GetClump());
+	CAnimBlendAssociation *walkRunAssoc = nil;
+	float walkRunAssocBlend = 0.0f, idleAssocBlend = 0.0f;
+	bool isSkater = m_pedStats == CPedStats::ms_apPedStats[PEDSTAT_SKATER];
 
-// --MIAMI: Done
-void
-CPed::PedSetDraggedOutCarPositionCB(CAnimBlendAssociation* animAssoc, void* arg)
-{
-	CPed *ped = (CPed*)arg;
+	CVector footPosL(0.0f, 0.0f, 0.0f), footPosR(0.0f, 0.0f, 0.0f);
+	bool footPosLok = false, footPosRok = false;
 
-	ped->bUsesCollision = true;
-	ped->RestartNonPartialAnims();
+	if (bDoBloodyFootprints) {
+		if (m_bloodyFootprintCountOrDeathTime > 0 && m_bloodyFootprintCountOrDeathTime < 300) {
+			m_bloodyFootprintCountOrDeathTime--;
 
-	CMatrix pedMat(ped->GetMatrix());
-	CVector draggedOutOffset;
-	if (ped->m_pMyVehicle && ped->m_pMyVehicle->IsBike()) {
-		AssocGroupId animGroup = ((CBike*)ped->m_pMyVehicle)->m_bikeAnimType;
-		switch (animGroup) {
-			case ASSOCGRP_BIKE_VESPA:
-				draggedOutOffset = vecPedVespaBikeJumpRhsAnimOffset;
-				break;
-			case ASSOCGRP_BIKE_HARLEY:
-				draggedOutOffset = vecPedHarleyBikeJumpRhsAnimOffset;
-				break;
-			case ASSOCGRP_BIKE_DIRT:
-				draggedOutOffset = vecPedDirtBikeJumpRhsAnimOffset;
-				break;
-			default:
-				draggedOutOffset = vecPedStdBikeJumpRhsAnimOffset;
-				break;
+			if (m_bloodyFootprintCountOrDeathTime == 0)
+				bDoBloodyFootprints = false;
 		}
-	} else {
-		draggedOutOffset = vecPedDraggedOutCarAnimOffset;
-	}
-	if (ped->m_vehEnterType == CAR_DOOR_RF || ped->m_vehEnterType == CAR_DOOR_RR)
-		draggedOutOffset.x = -draggedOutOffset.x;
-
-	CVector posAfterBeingDragged = Multiply3x3(pedMat, draggedOutOffset);
-	posAfterBeingDragged += ped->GetPosition();
-	CPedPlacement::FindZCoorForPed(&posAfterBeingDragged);
-	ped->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-	ped->SetPosition(posAfterBeingDragged);
-
-	if (ped->m_pMyVehicle && !ped->m_pMyVehicle->IsBike() && !ped->m_pMyVehicle->IsRoomForPedToLeaveCar(ped->m_vehEnterType, &vecPedDraggedOutCarAnimOffset)) {
-		ped->PositionPedOutOfCollision();
 	}
 
-	if (!ped->CanSetPedState())
-		return;
-	
-	if (!ped->m_pMyVehicle) {
-		ped->SetIdle();
-		ped->SetGetUp();
+	if (!bIsStanding)
 		return;
-	}
-
-	CPed *driver = ped->m_pMyVehicle->pDriver;
-
-	if (ped->IsPlayer()) {
-		ped->SetIdle();
 
-	} else if (ped->bFleeAfterExitingCar) {
-		ped->bFleeAfterExitingCar = false;
-		ped->SetFlee(ped->m_pMyVehicle->GetPosition(), 4000);
-
-	} else if (ped->bWanderPathAfterExitingCar) {
-		ped->SetWanderPath(CGeneral::GetRandomNumberInRange(0.0f, 8.0f));
-		ped->bWanderPathAfterExitingCar = false;
-
-	} else if (ped->bGonnaKillTheCarJacker) {
-		// Kill objective is already set at this point.
-
-		ped->bGonnaKillTheCarJacker = false;
-		if (!ped->m_pedInObjective || !(CGeneral::GetRandomNumber() & 1)) {
-			if (!driver || driver == ped || driver->IsPlayer() && CTheScripts::IsPlayerOnAMission()) {
-				ped->SetPedState(PED_NONE);
-				ped->m_nLastPedState = PED_NONE;
-				ped->SetFlee(ped->m_pMyVehicle->GetPosition(), 4000);
-			} else {
-				ped->ClearObjective();
-				ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, ped->m_pMyVehicle);
-			}
+	for (; assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
+		if (assoc->flags & ASSOC_WALK) {
+			walkRunAssoc = assoc;
+			walkRunAssocBlend += assoc->blendAmount;
+		} else if ((assoc->flags & ASSOC_NOWALK) == 0) {
+			idleAssocBlend += assoc->blendAmount;
 		}
-
-	} else if (ped->m_pedStats->m_temper > ped->m_pedStats->m_fear && ped->CharCreatedBy != MISSION_CHAR
-		&& ped->m_pMyVehicle->VehicleCreatedBy != MISSION_VEHICLE && driver
-		&& driver->IsPlayer() && !CTheScripts::IsPlayerOnAMission()) {
-		ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, ped->m_pMyVehicle);
-
-	} else if (ped->m_pedStats->m_temper > ped->m_pedStats->m_fear && ped->CharCreatedBy != MISSION_CHAR
-		&& ped->m_pMyVehicle->VehicleCreatedBy != MISSION_VEHICLE && !driver
-		&& FindPlayerPed()->m_carInObjective == ped->m_pMyVehicle && !CTheScripts::IsPlayerOnAMission())
-		ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, ped->m_pMyVehicle);
-	else {
-		ped->SetPedState(PED_NONE);
-		ped->m_nLastPedState = PED_NONE;
-		ped->SetFindPathAndFlee(ped->m_pMyVehicle->GetPosition(), 10000);
 	}
-	ped->SetGetUp();
-}
 
-// --MIAMI: Done
-void
-CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg)
-{
-	CPed *ped = (CPed*)arg;
-
-	CVehicle *veh = ped->m_pMyVehicle;
+	if (walkRunAssoc && walkRunAssocBlend > 0.5f && idleAssocBlend < 1.0f) {
 
-	// Pointless code
-	if (!veh)
-		return;
+		float stepStart = 1.f / 15.f;
+		float stepEnd = walkRunAssoc->hierarchy->totalLength / 2.0f + stepStart;
+		float currentTime = walkRunAssoc->currentTime;
 
-	// Situation of entering car as a driver while there is already a driver exiting atm.
-	CPed *driver = veh->pDriver;
-	if (driver && driver->m_nPedState == PED_DRIVING && !veh->bIsBus && driver->m_objective == OBJECTIVE_LEAVE_CAR
-		&& (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || ped->m_nPedState == PED_CARJACK)) {
+		if (isSkater) {
+			// both are unused
+			static float stepStartSection = 1.0f;
+			static float animSections = 15.f;
 
-		if (!ped->IsPlayer() && (ped->CharCreatedBy != MISSION_CHAR || driver->IsPlayer())) {
-			ped->QuitEnteringCar();
-			return;
-		}
-		if (driver->CharCreatedBy == MISSION_CHAR) {
-			PedSetOutCarCB(nil, veh->pDriver);
-			if (driver->m_pMyVehicle) {
-				driver->PositionPedOutOfCollision();
+			float moveStart, soundVolume, skateTime;
+			if (walkRunAssoc->animId == ANIM_WALK) {
+				moveStart = 0.0f;
+				skateTime = 8.f / 15.f;
 			} else {
-				driver->m_pMyVehicle = veh;
-				driver->PositionPedOutOfCollision();
-				driver->m_pMyVehicle = nil;
-			}
-			veh->pDriver = nil;
-		} else {
-			driver->SetDead();
-			driver->FlagToDestroyWhenNextProcessed();
-			veh->pDriver = nil;
-		}
-	}
-
-	if (ped->bRemoveMeWhenIGotIntoCar) {
-		ped->bRemoveMeWhenIGotIntoCar = false;
-		ped->bRemoveFromWorld = true;
-	}
-	if (ped->bCollectBusFare) {
-		ped->bCollectBusFare = false;
-		if (FindPlayerPed())
-			FindPlayerPed()->m_nLastBusFareCollected += 5;
-	}
-
-	if (!ped->IsNotInWreckedVehicle() || ped->DyingOrDead())
-		return;
-
-	ped->bInVehicle = true;
-	if (ped->m_nPedType == PEDTYPE_PROSTITUTE) {
-		if (veh->pDriver) {
-			if (veh->pDriver->IsPlayer() && ped->CharCreatedBy == RANDOM_CHAR) {
-				CWorld::Players[CWorld::PlayerInFocus].m_nSexFrequency = 1000;
-				CWorld::Players[CWorld::PlayerInFocus].m_nNextSexMoneyUpdateTime = CTimer::GetTimeInMilliseconds() + 1000;
-				CWorld::Players[CWorld::PlayerInFocus].m_nNextSexFrequencyUpdateTime = CTimer::GetTimeInMilliseconds() + 3000;
-				CWorld::Players[CWorld::PlayerInFocus].m_pHooker = (CCivilianPed*)ped;
-			}
-		}
-	}
-	if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || ped->m_nPedState == PED_CARJACK)
-		veh->bIsBeingCarJacked = false;
-
-	if (veh->m_nNumGettingIn)
-		--veh->m_nNumGettingIn;
-
-	if (ped->IsPlayer() && ((CPlayerPed*)ped)->m_bAdrenalineActive)
-		((CPlayerPed*)ped)->ClearAdrenaline();
-
-	if (veh->IsBoat()) {
-		if (ped->IsPlayer()) {
-			CCarCtrl::RegisterVehicleOfInterest(veh);
-			if (veh->GetStatus() == STATUS_SIMPLE) {
-				veh->m_vecMoveSpeed = CVector(0.0f, 0.0f, -0.00001f);
-				veh->m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
-			}
-			veh->SetStatus(STATUS_PLAYER);
-			AudioManager.PlayerJustGotInCar();
-		}
-		veh->SetDriver(ped);
-		if (!veh->bEngineOn)
-			veh->bEngineOn = true;
-
-		ped->SetPedState(PED_DRIVING);
-		ped->StopNonPartialAnims();
-		ped->RemoveWeaponWhenEnteringVehicle();
-		return;
-	}
-
-	if (ped->m_pVehicleAnim)
-		ped->m_pVehicleAnim->blendDelta = -1000.0f;
-
-	ped->bDoBloodyFootprints = false;
-	if (veh->m_nAlarmState == -1)
-		veh->m_nAlarmState = 15000;
-
-	if (ped->IsPlayer()) {
-		if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || veh->IsBike()) {
-			if (veh->GetStatus() == STATUS_SIMPLE) {
-				veh->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-				veh->m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
-			}
-			veh->SetStatus(STATUS_PLAYER);
-		}
-		AudioManager.PlayerJustGotInCar();
-	} else if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
-		if (veh->GetStatus() == STATUS_SIMPLE) {
-			veh->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-			veh->m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
-		}
-		veh->SetStatus(STATUS_PHYSICS);
-	}
-	
-	if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
-		for (int i = 0; i < veh->m_nNumMaxPassengers; ++i) {
-			CPed *passenger = veh->pPassengers[i];
-			if (passenger && !passenger->bStayInCarOnJack && !passenger->bHeldHostageInCar && (passenger->m_leader != ped || !ped->bIsLeader)) {
-				passenger->SetObjective(OBJECTIVE_LEAVE_CAR, veh);
-				passenger->m_leaveCarTimer = CTimer::GetTimeInMilliseconds();
+				moveStart = 0.0f;
+				skateTime = 5.f / 15.f;
 			}
-		}
-	}
-
-	if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || ped->m_nPedState == PED_CARJACK) {
-		veh->SetDriver(ped);
-		if (veh->VehicleCreatedBy == PARKED_VEHICLE) {
-			veh->VehicleCreatedBy = RANDOM_VEHICLE;
-			++CCarCtrl::NumRandomCars;
-			--CCarCtrl::NumParkedCars;
-		}
-		if (veh->bIsAmbulanceOnDuty) {
-			veh->bIsAmbulanceOnDuty = false;
-			--CCarCtrl::NumAmbulancesOnDuty;
-		}
-		if (veh->bIsFireTruckOnDuty) {
-			veh->bIsFireTruckOnDuty = false;
-			--CCarCtrl::NumFiretrucksOnDuty;
-		}
-		if (ped->m_nPedType == PEDTYPE_COP && veh->IsLawEnforcementVehicle())
-			veh->ChangeLawEnforcerState(true);
-
-		if (!veh->bEngineOn) {
-			veh->bEngineOn = true;
-			DMAudio.PlayOneShot(ped->m_audioEntityId, SOUND_CAR_ENGINE_START, 1.0f);
-		}
-		if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER && ped->CharCreatedBy == RANDOM_CHAR
-			&& ped != FindPlayerPed() && ped->m_nPedType != PEDTYPE_EMERGENCY) {
-
-			CCarCtrl::JoinCarWithRoadSystem(veh);
-			veh->AutoPilot.m_nCarMission = MISSION_CRUISE;
-			veh->AutoPilot.m_nTempAction = TEMPACT_NONE;
-			veh->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
-			veh->AutoPilot.m_nCruiseSpeed = 25;
-		}
-		ped->SetPedState(PED_DRIVING);
-		if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
-
-			if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT
-				|| ped->m_prevObjective == OBJECTIVE_SPRINT_TO_AREA || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT)
-				ped->m_prevObjective = OBJECTIVE_NONE;
-
-			ped->RestorePreviousObjective();
-		}
-
-	} else {
-
-		bool slowDown = false;
-		if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && veh->pDriver && ped->CharCreatedBy == RANDOM_CHAR)
-			slowDown = true;
-
-		// VC also has a dead condition in here.
-
-		if (veh->IsBike()) {
-			veh->AddPassenger(ped, 0);
-		} else if (veh->bIsBus) {
-			veh->AddPassenger(ped);
-		} else {
-			switch (ped->m_vehEnterType) {
-				case CAR_DOOR_RF:
-					veh->AddPassenger(ped, 0);
+			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 CAR_DOOR_RR:
-					veh->AddPassenger(ped, 2);
+				case ADHESIVE_SAND:
+					if (CGeneral::GetRandomNumber() % 64) {
+						m_vecAnimMoveDelta *= 0.2f;
+					} else {
+						SetFall(0, ANIM_KO_SKID_BACK, false);
+					}
+					soundVolume = 0.2f;
 					break;
-				case CAR_DOOR_LR:
-					veh->AddPassenger(ped, 1);
+				case ADHESIVE_WET:
+					m_vecAnimMoveDelta *= 0.3f;
+					soundVolume = 0.2f;
 					break;
 				default:
-					veh->AddPassenger(ped);
-				break;
+					soundVolume = 1.f;
+					break;
 			}
-		}
-		ped->SetPedState(PED_DRIVING);
-		if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT
-			|| ped->m_prevObjective == OBJECTIVE_SPRINT_TO_AREA || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT)
-			ped->m_prevObjective = OBJECTIVE_NONE;
-
-		ped->RestorePreviousObjective();
-
-		// VC has conditional OBJECTIVE_LEAVE_CAR here, which runs if it entered the first dead condition.
-
-		if(slowDown)
-			veh->AutoPilot.m_nCruiseSpeed = 17;
-	}
-
-	int8 doorFlag;
-	if (veh->IsBike()) {
-		doorFlag = GetBikeDoorFlagInclJumpInFromFront(ped->m_vehEnterType);
-	} else {
-		doorFlag = GetEnterCarDoorFlag(ped->m_vehEnterType, veh->m_nNumMaxPassengers);
-	}
-
-	veh->m_nGettingInFlags &= ~doorFlag;
-
-	if (veh->bIsBus && !veh->m_nGettingInFlags)
-		((CAutomobile*)veh)->SetBusDoorTimer(1000, 1);
-
-	switch (ped->m_objective) {
-		case OBJECTIVE_KILL_CHAR_ON_FOOT:
-		case OBJECTIVE_KILL_CHAR_ANY_MEANS:
-		case OBJECTIVE_LEAVE_CAR:
-		case OBJECTIVE_FOLLOW_CAR_IN_CAR:
-		case OBJECTIVE_GOTO_AREA_ANY_MEANS:
-		case OBJECTIVE_GOTO_AREA_ON_FOOT:
-		case OBJECTIVE_RUN_TO_AREA:
-		case OBJECTIVE_GOTO_SEAT_ON_FOOT:
-		case OBJECTIVE_GOTO_ATM_ON_FOOT:
-		case OBJECTIVE_GOTO_BUS_STOP_ON_FOOT:
-		case OBJECTIVE_GOTO_PIZZA_ON_FOOT:
-		case OBJECTIVE_GOTO_SHELTER_ON_FOOT:
-		case OBJECTIVE_SPRINT_TO_AREA:
-		case OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT:
-			break;
-		default:
-			ped->SetObjective(OBJECTIVE_NONE);
-	}
-
-	ped->AddInCarAnims(veh, veh->pDriver == ped);
-	if (veh->bIsBus)
-		ped->bRenderPedInCar = false;
-
-	// FIX: RegisterVehicleOfInterest not just registers the vehicle, but also updates register time. So remove the IsThisVehicleInteresting check.
-#ifndef FIX_BUGS
-	if (ped->IsPlayer() && !CCarCtrl::IsThisVehicleInteresting(veh) && veh->VehicleCreatedBy != MISSION_VEHICLE) {
-#else
-	if (ped->IsPlayer() && veh->VehicleCreatedBy != MISSION_VEHICLE) {
-#endif
-		CCarCtrl::RegisterVehicleOfInterest(veh);
-
-		if (!veh->bHasBeenOwnedByPlayer && veh->VehicleCreatedBy != MISSION_VEHICLE)
-			CEventList::RegisterEvent(EVENT_STEAL_CAR, EVENT_ENTITY_VEHICLE, veh, ped, 1500);
-
-		veh->bHasBeenOwnedByPlayer = true;
-	}
-	ped->bChangedSeat = true;
-}
-
-// --MIAMI: Done :D
-void
-CPed::PedSetInTrainCB(CAnimBlendAssociation* animAssoc, void* arg)
-{
-	CPed *ped = (CPed*)arg;
-	CTrain *veh = (CTrain*)ped->m_pMyVehicle;
-
-	if (!veh)
-		return;
-
-	ped->bInVehicle = true;
-	ped->SetPedState(PED_DRIVING);
-	ped->RestorePreviousObjective();
-	ped->SetMoveState(PEDMOVE_STILL);
-	veh->AddPassenger(ped);
-}
-
-// --MIAMI: Done
-void
-CPed::PedStaggerCB(CAnimBlendAssociation* animAssoc, void* arg)
-{
-	/*
-	CPed *ped = (CPed*)arg;
-
-	if (ped->m_nPedState == PED_STAGGER)
-		// nothing
-	*/
-}
-
-// --MIAMI: Done
-bool
-CPed::RunToReportCrime(eCrimeType crimeToReport)
-{
-	// They changed true into false to make this function unusable. So running to phone actually starts but first frame after that cancels it.
-	if (m_nPedState == PED_SEEK_POS)
-		return false;
-
-	CVector pos = GetPosition();
-	int phoneId = gPhoneInfo.FindNearestFreePhone(&pos);
-
-	if (phoneId == -1)
-		return false;
-
-	CPhone *phone = &gPhoneInfo.m_aPhones[phoneId];
-	if (phone->m_nState != PHONE_STATE_FREE)
-		return false;
-
-	bRunningToPhone = true;
-	SetSeek(phone->m_vecPos, 0.3f);
-	SetMoveState(PEDMOVE_RUN);
-	m_phoneId = phoneId;
-	m_crimeToReportOnPhone = crimeToReport;
-	return true;
-}
-
-// --MIAMI: Done
-void
-CPed::RegisterThreatWithGangPeds(CEntity *attacker)
-{
-	CPed *attackerPed = nil;
-	if ((CharCreatedBy == MISSION_CHAR && bIsPlayerFriend && (attacker == FindPlayerPed() || attacker == FindPlayerVehicle()))
-		|| (attacker && m_leader == attacker)
-		|| (m_nPedType == PEDTYPE_GANG7 && attacker == FindPlayerPed()))
-		return;
-
-	if (attacker) {
-		if (m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT && m_objective != OBJECTIVE_KILL_CHAR_ANY_MEANS) {
-			if (attacker->IsPed()) {
-				attackerPed = (CPed*)attacker;
-			} else if (attacker->IsVehicle()) {
-				attackerPed = ((CVehicle*)attacker)->pDriver;
-				if (!attackerPed)
-					return;
-			} else
-				return;
-
-			if (attackerPed && (attackerPed->IsPlayer() || attackerPed->IsGangMember())) {
-				for (int i = 0; i < m_numNearPeds; ++i) {
-					CPed *nearPed = m_nearPeds[i];
-					if (nearPed->IsPointerValid()) {
-						if (nearPed->CharCreatedBy == RANDOM_CHAR && nearPed != this && nearPed->m_nPedType == m_nPedType)
-							nearPed->m_fearFlags |= CPedType::GetFlag(attackerPed->m_nPedType);
-					}
+			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)));
 				}
 			}
-		}
-	}
-
-	if (attackerPed && attackerPed->IsPlayer() && (attackerPed->m_nPedState == PED_CARJACK || attackerPed->bInVehicle)) {
-		if (!attackerPed->m_pMyVehicle || attackerPed->m_pMyVehicle->GetModelIndex() != MI_TOPFUN) {
-			int16 lastVehicle;
-			CEntity *vehicles[8];
-			CWorld::FindObjectsInRange(GetPosition(), 30.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
-
-			if (lastVehicle > 8)
-				lastVehicle = 8;
 
-			for (int j = 0; j < lastVehicle; ++j) {
-				CVehicle *nearVeh = (CVehicle*) vehicles[j];
-
-				if (nearVeh->VehicleCreatedBy != MISSION_VEHICLE) {
-					CPed *nearVehDriver = nearVeh->pDriver;
+		} else {
+			int stepPart = 0;
+			
+			// This section is shortened/optimized for sanity.
 
-					if (nearVehDriver && nearVehDriver != this && nearVehDriver->m_nPedType == m_nPedType && nearVehDriver->CharCreatedBy == RANDOM_CHAR) {
+			if (currentTime >= stepStart && currentTime - walkRunAssoc->timeStep < stepStart)
+				stepPart = 1;
+			else if (currentTime >= stepEnd && currentTime - walkRunAssoc->timeStep < stepEnd)
+				stepPart = 2;
 
-						if (nearVeh->IsVehicleNormal() && nearVeh->IsCar()) {
-							nearVeh->AutoPilot.m_nCruiseSpeed = GAME_SPEED_TO_CARAI_SPEED * nearVeh->pHandling->Transmission.fUnkMaxVelocity * 0.8f;
-							nearVeh->AutoPilot.m_nCarMission = MISSION_RAMPLAYER_FARAWAY;
-							nearVeh->SetStatus(STATUS_PHYSICS);
-							nearVeh->AutoPilot.m_nTempAction = TEMPACT_NONE;
-							nearVeh->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
-						}
-					}
+			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;
 				}
-			}
-		}
-	}
-}
 
-// --MIAMI: Done
-void
-CPed::ReactToPointGun(CEntity *entWithGun)
-{
-	CPed *pedWithGun = (CPed*)entWithGun;
-	int waitTime;
-
-	if (IsPlayer() || !IsPedInControl() || (CharCreatedBy == MISSION_CHAR && !bCrouchWhenScared))
-		return;
-
-	if (m_leader == pedWithGun)
-		return;
-
-	if (m_nWaitState == WAITSTATE_PLAYANIM_HANDSUP || m_nWaitState == WAITSTATE_PLAYANIM_HANDSCOWER ||
-		(GetPosition() - pedWithGun->GetPosition()).MagnitudeSqr2D() > 225.0f || (m_nPedType == PEDTYPE_GANG7 && pedWithGun == FindPlayerPed()))
-		return;
-
-	if (m_leader) {
-		if (FindPlayerPed() == m_leader)
-			return;
+				CVector forward = GetForward();
 
-		ClearLeader();
-	}
-	if (m_pedStats->m_flags & STAT_GUN_PANIC
-		&& (m_nPedState != PED_ATTACK || GetWeapon()->IsTypeMelee())
-		&& m_nPedState != PED_FLEE_ENTITY && m_nPedState != PED_AIM_GUN) {
-
-		waitTime = CGeneral::GetRandomNumberInRange(3000, 6000);
-		SetWaitState(WAITSTATE_PLAYANIM_HANDSCOWER, &waitTime);
-		Say(SOUND_PED_HANDS_COWER);
-		m_pLookTarget = pedWithGun;
-		m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
-		SetMoveState(PEDMOVE_NONE);
-
-	} else if (m_nPedType != pedWithGun->m_nPedType) {
-		if (IsGangMember() || m_nPedType == PEDTYPE_EMERGENCY || m_nPedType == PEDTYPE_FIREMAN) {
-			RegisterThreatWithGangPeds(pedWithGun);
-		}
+				adjustedFootPos.z -= 0.1f;
+				adjustedFootPos += 0.2f * forward;
 
-		if (m_nPedType == PEDTYPE_COP) {
-			if (pedWithGun->IsPlayer()) {
-				((CPlayerPed*)pedWithGun)->m_pWanted->SetWantedLevelNoDrop(2);
-				if (bCrouchWhenShooting || bKindaStayInSamePlace) {
-					SetDuck(CGeneral::GetRandomNumberInRange(1000, 3000));
-					return;
-				}
-			}
-		}
+				if (bDoBloodyFootprints) {
+					CVector2D top(forward * 0.26f);
+					CVector2D right(GetRight() * (stepPart == 1 ? 0.14f : 0.1f));
 
-		if (m_nPedType != PEDTYPE_COP
-			&& (m_nPedState != PED_ATTACK || GetWeapon()->IsTypeMelee())
-			&& (m_nPedState != PED_FLEE_ENTITY || pedWithGun->IsPlayer() && m_fleeFrom != pedWithGun)
-			&& m_nPedState != PED_AIM_GUN && m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT) {
-
-			waitTime = CGeneral::GetRandomNumberInRange(3000, 6000);
-			SetWaitState(WAITSTATE_PLAYANIM_HANDSUP, &waitTime);
-			Say(SOUND_PED_HANDS_UP);
-			m_pLookTarget = pedWithGun;
-			m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
-			SetMoveState(PEDMOVE_NONE);
-			if (m_nPedState == PED_FLEE_ENTITY) {
-				m_fleeFrom = pedWithGun;
-				m_fleeFrom->RegisterReference((CEntity **) &m_fleeFrom);
-			}
+					CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &adjustedFootPos,
+						top.x, top.y,
+						right.x, right.y,
+						255, 255, 0, 0, 4.0f, 3000, 1.0f);
 
-			if (FindPlayerPed() == pedWithGun && bRichFromMugging) {
-				int money = CGeneral::GetRandomNumberInRange(100, 300);
-				int pickupCount = money / 40 + 1;
-				int moneyPerPickup = money / pickupCount;
-
-				for (int i = 0; i < pickupCount; i++) {
-					float pickupX = 1.5f * Sin((CGeneral::GetRandomNumber() % 256)/256.0f * TWOPI) + GetPosition().x;
-					float pickupY = 1.5f * Cos((CGeneral::GetRandomNumber() % 256)/256.0f * TWOPI) + GetPosition().y;
-					bool found = false;
-					float groundZ = CWorld::FindGroundZFor3DCoord(pickupX, pickupY, GetPosition().z, &found) + 0.5f;
-					if (found) {
-						CPickups::GenerateNewOne(CVector(pickupX, pickupY, groundZ), MI_MONEY, PICKUP_MONEY, moneyPerPickup + (CGeneral::GetRandomNumber() & 7));
+					if (m_bloodyFootprintCountOrDeathTime <= 20) {
+						m_bloodyFootprintCountOrDeathTime = 0;
+						bDoBloodyFootprints = false;
+					} else {
+						m_bloodyFootprintCountOrDeathTime -= 20;
 					}
 				}
-				bRichFromMugging = false;
-			}
-		}
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg)
-{
-	CPed *ped = (CPed*)arg;
-
-	CVehicle *veh = ped->m_pMyVehicle;
-
-	bool startedToRun = false;
-	ped->bUsesCollision = true;
-	ped->m_actionX = 0.0f;
-	ped->m_actionY = 0.0f;
-	ped->bVehExitWillBeInstant = false;
-	if (veh && veh->IsBoat())
-		ped->ApplyMoveSpeed();
-
-	if (ped->m_objective == OBJECTIVE_LEAVE_CAR)
-		ped->RestorePreviousObjective();
-	else if (ped->m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE) {
-		ped->m_fHealth = 0.0f;
-		ped->SetDie(ANIM_FLOOR_HIT, 4.0f, 0.5f);
-	}
-
-	ped->bInVehicle = false;
-	if (veh && (veh->IsCar() || veh->IsBike())) {
-		CWorld::pIgnoreEntity = veh;
-		if (CWorld::TestSphereAgainstWorld(ped->GetPosition() - CVector(0.f, 0.f, 0.2f),
-				0.4f, veh, true, true, false, false, false, false)
-			|| CWorld::TestSphereAgainstWorld(ped->GetPosition() + CVector(0.f, 0.f, 0.2f),
-				0.4f, veh, true, true, false, false, false, false)
-			|| !CWorld::GetIsLineOfSightClear(veh->GetPosition(), ped->GetPosition(), true, false, false, true, false, false, false)) {
-			CWorld::pIgnoreEntity = nil;
-			ped->PositionPedOutOfCollision();
-		}
-		CWorld::pIgnoreEntity = nil;
-	}
-
-	if (ped->m_nPedState == PED_EXIT_CAR) {
-		if (ped->m_nPedType == PEDTYPE_COP) {
-			ped->SetIdle();
-			if (((CCopPed*)ped)->m_nCopType == COP_MIAMIVICE && ped->m_pMyVehicle && ped->m_pMyVehicle->pDriver == ped) {
-				DMAudio.PlayOneShot(ped->m_audioEntityId, SOUND_PED_MIAMIVICE_EXITING_CAR, 0.f);
-			}
-		} else
-			ped->RestorePreviousState();
-
-		veh = ped->m_pMyVehicle;
-		if (ped->bFleeAfterExitingCar && veh) {
-			ped->bFleeAfterExitingCar = false;
-			ped->SetFlee(veh->GetPosition(), 12000);
-			ped->bUsePedNodeSeek = true;
-			ped->m_pNextPathNode = nil;
-			if (CGeneral::GetRandomNumber() & 1 || ped->m_pedStats->m_fear > 70) {
-				ped->SetMoveState(PEDMOVE_SPRINT);
-				ped->Say(SOUND_PED_FLEE_SPRINT);
-			} else {
-				ped->SetMoveState(PEDMOVE_RUN);
-				ped->Say(SOUND_PED_FLEE_RUN);
-			}
-			startedToRun = true;
-
-			// This is not a good way to do this...
-			ped->m_nLastPedState = PED_WANDER_PATH;
-
-		} else if (ped->bWanderPathAfterExitingCar) {
-			ped->SetWanderPath(CGeneral::GetRandomNumberInRange(0.0f, 8.0f));
-			ped->bWanderPathAfterExitingCar = false;
-			if (ped->m_nPedType == PEDTYPE_PROSTITUTE)
-				ped->SetObjectiveTimer(30000);
-			ped->m_nLastPedState = PED_NONE;
-
-		} else if (ped->bGonnaKillTheCarJacker) {
-
-			// Kill objective is already given at this point.
-			ped->bGonnaKillTheCarJacker = false;
-			if (ped->m_pedInObjective) {
-				if (!(CGeneral::GetRandomNumber() & 1)
-					&& ped->m_nPedType != PEDTYPE_COP
-					&& (!ped->m_pedInObjective->IsPlayer() || !CTheScripts::IsPlayerOnAMission())) {
-					ped->ClearObjective();
-					ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, veh);
-				}
-				ped->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 1500;
-			}
-			int waitTime = 1500;
-			ped->SetWaitState(WAITSTATE_PLAYANIM_COWER, &waitTime);
-			ped->SetMoveState(PEDMOVE_RUN);
-			startedToRun = true;
-		} else if (ped->m_objective == OBJECTIVE_NONE && ped->CharCreatedBy != MISSION_CHAR && ped->m_nPedState == PED_IDLE && !ped->IsPlayer()) {
-			ped->SetWanderPath(CGeneral::GetRandomNumberInRange(0.0f, 8.0f));
-		}
-	}
-#ifdef VC_PED_PORTS
-	else if (ped->m_nPedState == PED_DRIVING) {
-		ped->m_nPedState = PED_IDLE;
-	}
-#endif
-
-	if (animAssoc)
-		animAssoc->blendDelta = -1000.0f;
-
-	ped->RestartNonPartialAnims();
-	ped->m_pVehicleAnim = nil;
-	ped->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-	veh = ped->m_pMyVehicle;
-	if (veh) {
-		if (ped->m_nPedType == PEDTYPE_PROSTITUTE) {
-			if (veh->pDriver) {
-				if (veh->pDriver->IsPlayer() && ped->CharCreatedBy == RANDOM_CHAR) {
-					CWorld::Players[CWorld::PlayerInFocus].m_nNextSexMoneyUpdateTime = 0;
-					CWorld::Players[CWorld::PlayerInFocus].m_nNextSexFrequencyUpdateTime = 0;
-					CWorld::Players[CWorld::PlayerInFocus].m_pHooker = nil;
-					CWorld::Players[CWorld::PlayerInFocus].m_nMoney -= 100;
-					if (CWorld::Players[CWorld::PlayerInFocus].m_nMoney < 0)
-						CWorld::Players[CWorld::PlayerInFocus].m_nMoney = 0;
-				}
-			}
-		}
-		if (veh && veh->IsBike())
-			// BUG? 
-			veh->m_nGettingOutFlags &= ~GetBikeDoorFlag(ped->m_vehEnterType);
-		else
-			veh->m_nGettingOutFlags &= ~GetCarDoorFlag(ped->m_vehEnterType);
+				if (m_nSurfaceTouched == SURFACE_SAND || m_nSurfaceTouched == SURFACE_SAND_BEACH) {
+					CVector2D top(forward * -0.26f);
+					CVector2D right(GetRight() * (stepPart == 1 ? 0.1f : 0.14f));
 
-		if (veh->pDriver == ped) {
-			veh->RemoveDriver();
-			veh->SetStatus(STATUS_ABANDONED);
-			if (veh->m_nDoorLock == CARLOCK_LOCKED_INITIALLY)
-				veh->m_nDoorLock = CARLOCK_UNLOCKED;
-			if (ped->m_nPedType == PEDTYPE_COP && veh->IsLawEnforcementVehicle())
-				veh->ChangeLawEnforcerState(false);
-			if (veh->IsBike()) {
-				if (Abs(veh->m_vecMoveSpeed.x) < 0.1 && Abs(veh->m_vecMoveSpeed.y) < 0.1f) {
-					((CBike*)veh)->bIsStanding = true;
+					CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpShadowPedTex, &adjustedFootPos,
+						top.x, top.y,
+						right.x, right.y,
+						120, 250, 250, 50, 4.0f, 5000, 1.0f);
 				}
-			}
-		} else {
-			veh->RemovePassenger(ped);
-		}
-
-		if (veh->bIsBus && !veh->IsUpsideDown() && !veh->IsOnItsSide()) {
-			float angleAfterExit;
-			if (ped->m_vehEnterType == CAR_DOOR_LF) {
-				angleAfterExit = HALFPI + veh->GetForward().Heading();
-			} else {
-				angleAfterExit = veh->GetForward().Heading() - HALFPI;
-			}
-			ped->SetHeading(angleAfterExit);
-			ped->m_fRotationDest = angleAfterExit;
-			ped->m_fRotationCur = angleAfterExit;
-			if (!ped->bBusJacked)
-				ped->SetMoveState(PEDMOVE_WALK);
-		}
-		if (CGarages::IsPointWithinAnyGarage(ped->GetPosition()))
-			veh->bLightsOn = false;
-	}
-
-	if (ped->IsPlayer())
-		AudioManager.PlayerJustLeftCar();
-
-	ped->ReplaceWeaponWhenExitingVehicle();
-
-	ped->bOnBoat = false;
-	if (ped->bBusJacked) {
-		ped->SetFall(1500, ANIM_KO_SKID_BACK, false);
-		ped->bBusJacked = false;
-	}
-	ped->m_nStoredMoveState = PEDMOVE_NONE;
-	if (!ped->IsPlayer()) {
-		// It's a shame...
-#ifdef FIX_BUGS
-		int createdBy = ped->CharCreatedBy;
-#else
-		int createdBy = !ped->CharCreatedBy;
-#endif
-
-		if (createdBy == MISSION_CHAR && !startedToRun)
-			ped->SetMoveState(PEDMOVE_WALK);
-	}
-	ped->bHeldHostageInCar = false;
-}
-
-// --MIAMI: Done, but enumarate weapon slots
-void
-CPed::ReplaceWeaponWhenExitingVehicle(void)
-{
-	eWeaponType weaponType = GetWeapon()->m_eWeaponType;
-
-	// If it's Uzi, we may have stored weapon. Uzi is the only gun we can use in car.
-	if (IsPlayer() && GetWeaponSlot(weaponType) == 5) {
-		if (m_storedWeapon != WEAPONTYPE_UNIDENTIFIED) {
-			SetCurrentWeapon(m_storedWeapon);
-			m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
-		}
-	} else {
-		AddWeaponModel(CWeaponInfo::GetWeaponInfo(weaponType)->m_nModelId);
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::RemoveWeaponWhenEnteringVehicle(void)
-{
-	if (IsPlayer() && HasWeaponSlot(5) && GetWeapon(5).m_nAmmoTotal > 0 && ((CPlayerPed*)this)->GetPlayerInfoForThisPlayerPed()->m_bDriveByAllowed) {
-		if (m_storedWeapon == WEAPONTYPE_UNIDENTIFIED)
-			m_storedWeapon = GetWeapon()->m_eWeaponType;
-		SetCurrentWeapon(GetWeapon(5).m_eWeaponType);
-	} else {
-		CWeaponInfo *ourWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-		RemoveWeaponModel(ourWeapon->m_nModelId);
-	}
-}
-
-#ifdef GTA_TRAIN
-void
-CPed::PedSetOutTrainCB(CAnimBlendAssociation *animAssoc, void *arg)
-{
-	CPed *ped = (CPed*)arg;
-
-	CVehicle *veh = ped->m_pMyVehicle;
-
-	if (ped->m_pVehicleAnim)
-		ped->m_pVehicleAnim->blendDelta = -1000.0f;
-
-	ped->bUsesCollision = true;
-	ped->m_pVehicleAnim = nil;
-	ped->bInVehicle = false;
-	ped->m_nPedState = PED_IDLE;
-	ped->RestorePreviousObjective();
-	ped->SetMoveState(PEDMOVE_STILL);
-
-	CMatrix pedMat(ped->GetMatrix());
-	ped->m_fRotationCur = HALFPI + veh->GetForward().Heading();
-	ped->m_fRotationDest = ped->m_fRotationCur;
-	CVector posAfterExit = Multiply3x3(pedMat, vecPedTrainDoorAnimOffset);
-	posAfterExit += ped->GetPosition();
-	CPedPlacement::FindZCoorForPed(&posAfterExit);
-	ped->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-	ped->SetPosition(posAfterExit);
-	ped->SetHeading(ped->m_fRotationCur);
-	veh->RemovePassenger(ped);
-}
-#endif
-
-// --MIAMI: Done
-bool
-CPed::PlacePedOnDryLand(void)
-{
-	float waterLevel = 0.0f;
-	CEntity *foundEnt = nil;
-	CColPoint foundCol;
-	float foundColZ;
-
-	CWaterLevel::GetWaterLevelNoWaves(GetPosition().x, GetPosition().y, GetPosition().z, &waterLevel);
-
-	CVector potentialGround = GetPosition();
-	potentialGround.z = waterLevel;
-
-	if (!CWorld::TestSphereAgainstWorld(potentialGround, 5.0f, nil, true, false, false, false, false, false))
-		return false;
-
-	CVector potentialGroundDist = gaTempSphereColPoints[0].point - GetPosition();
-	potentialGroundDist.z = 0.0f;
-	potentialGroundDist.Normalise();
-
-	CVector posToCheck = 0.5f * potentialGroundDist + gaTempSphereColPoints[0].point;
-	posToCheck.z = 3.0f + waterLevel;
-
-	if (CWorld::ProcessVerticalLine(posToCheck, waterLevel - 1.0f, foundCol, foundEnt, true, true, false, true, false, false, nil)) {
-		foundColZ = foundCol.point.z;
-		if (foundColZ >= waterLevel) {
-			posToCheck.z = 0.8f + foundColZ;
-			SetPosition(posToCheck);
-			bIsStanding = true;
-			bWasStanding = true;
-			return true;
-		}
-	}
-
-	posToCheck = 5.0f * potentialGroundDist + GetPosition();
-	posToCheck.z = 3.0f + waterLevel;
-
-	if (!CWorld::ProcessVerticalLine(posToCheck, waterLevel - 1.0f, foundCol, foundEnt, true, true, false, true, false, false, nil))
-		return false;
-
-	foundColZ = foundCol.point.z;
-	if (foundColZ < waterLevel)
-		return false;
-
-	posToCheck.z = 0.8f + foundColZ;
-	SetPosition(posToCheck);
-	bIsStanding = true;
-	bWasStanding = true;
-	return true;
-}
-
-// --MIAMI: Done
-void
-CPed::PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *animAssoc, void *arg)
-{
-	CPed *ped = (CPed*)arg;
-
-	CVehicle *veh = ped->m_pMyVehicle;
-
-	CVector finalPos;
-	CVector draggedOutOffset;
-
-	CMatrix pedMat(ped->GetMatrix());
-	ped->bUsesCollision = true;
-	ped->RestartNonPartialAnims();
-	draggedOutOffset = vecPedQuickDraggedOutCarAnimOffset;
-	if (ped->m_vehEnterType == CAR_DOOR_RF || ped->m_vehEnterType == CAR_DOOR_RR)
-		draggedOutOffset.x = -draggedOutOffset.x;
-
-	finalPos = Multiply3x3(pedMat, draggedOutOffset) + ped->GetPosition();
-	CPedPlacement::FindZCoorForPed(&finalPos);
-	ped->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-	ped->SetPosition(finalPos);
-
-	if (veh) {
-		ped->m_fRotationDest = veh->GetForward().Heading() - HALFPI;
-		ped->m_fRotationCur = ped->m_fRotationDest;
-		ped->CalculateNewOrientation();
-
-		if (!veh->IsRoomForPedToLeaveCar(ped->m_vehEnterType, &vecPedQuickDraggedOutCarAnimOffset))
-			ped->PositionPedOutOfCollision();
-	}
-
-	if (!ped->CanSetPedState())
-		return;
-
-	ped->SetIdle();
-	if (veh) {
-		if (ped->bFleeAfterExitingCar) {
-			ped->bFleeAfterExitingCar = false;
-			ped->SetFlee(veh->GetPosition(), 14000);
-
-		} else if (ped->bWanderPathAfterExitingCar) {
-			ped->SetWanderPath(CGeneral::GetRandomNumberInRange(0.0f, 8.0f));
-			ped->bWanderPathAfterExitingCar = false;
-
-		} else if (ped->bGonnaKillTheCarJacker) {
-			ped->bGonnaKillTheCarJacker = false;
-			if (ped->m_pedInObjective && CGeneral::GetRandomNumber() & 1) {
-				if (ped->m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT)
-					ped->SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, ped->m_pedInObjective);
+				if (CWeather::Rain <= 0.1f || CCullZones::CamNoRain() || CCullZones::PlayerNoRain()) {
+					if (IsPlayer())
+						particleProduceFootDust(this, adjustedFootPos, 0.0f, 4);
 
-			} else {
-				CPed *driver = veh->pDriver;
-				if (!driver || driver == ped || driver->IsPlayer() && CTheScripts::IsPlayerOnAMission()) {
-					ped->SetFlee(veh->GetPosition(), 14000);
-				} else {
-					ped->ClearObjective();
-					ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, veh);
+				} else if (stepPart == 2) {
+					particleProduceFootSplash(this, adjustedFootPos, 0.15f, 4);
 				}
-				ped->bUsePedNodeSeek = true;
-				ped->m_pNextPathNode = nil;
-				ped->Say(SOUND_PED_FLEE_RUN);
-			}
-		} else if (ped->m_pedStats->m_temper > ped->m_pedStats->m_fear
-			&& ped->CharCreatedBy != MISSION_CHAR && veh->VehicleCreatedBy != MISSION_VEHICLE
-			&& veh->pDriver && veh->pDriver->IsPlayer()
-			&& !CTheScripts::IsPlayerOnAMission()) {
-			ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, veh);
-
-		} else if (ped->m_pedStats->m_temper > ped->m_pedStats->m_fear
-			&& ped->CharCreatedBy != MISSION_CHAR && veh->VehicleCreatedBy != MISSION_VEHICLE
-			&& !veh->pDriver && FindPlayerPed()->m_carInObjective == veh
-			&& !CTheScripts::IsPlayerOnAMission()) {
-			ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, veh);
-
-		} else {
-			ped->SetFindPathAndFlee(veh->GetPosition(), 10000);
-			if (CGeneral::GetRandomNumber() & 1 || ped->m_pedStats->m_fear > 70) {
-				ped->SetMoveState(PEDMOVE_SPRINT);
-				ped->Say(SOUND_PED_FLEE_SPRINT);
-			} else {
-				ped->Say(SOUND_PED_FLEE_RUN);
 			}
 		}
 	}
-	if (ped->m_nLastPedState == PED_IDLE)
-		ped->m_nLastPedState = PED_WANDER_PATH;
-}
 
-// --MIAMI: Done
-bool
-CPed::PositionPedOutOfCollision(void)
-{
-	CVehicle *veh = m_pMyVehicle;
-	if (!veh)
-		return false;
+	if (IsPlayer() && !walkRunAssoc && bIsLanding) {
+		if (!footPosLok)
+			TransformToNode(footPosL, PED_FOOTL);
 
-	if (bDonePositionOutOfCollision)
-		return true;
+		CVector forward = GetForward();
 
-	bool foundAPos = false;
-	CColModel *vehCol = veh->GetColModel();
-	CVector vehPos = veh->GetPosition();
-	CVector ourPos = GetPosition();
-	CVector newPos = ourPos;
-	CWorld::pIgnoreEntity = veh;
-	bUsesCollision = false;
-	bJustCheckCollision = true;
-	m_vecMoveSpeed = CVector(0.f, 0.f, 0.f);
-	if (veh->IsOnItsSide()) {
-		// Top of the veh.
-		newPos = vehPos;
-		newPos.z = FEET_OFFSET + vehCol->boundingBox.max.x + vehPos.z;
-		GetMatrix().SetTranslate(newPos);
-		if (!CheckCollision()) {
-			if (CWorld::GetIsLineOfSightClear(vehPos, newPos, true, false, false, true, false, false, false))
-				foundAPos = true;
-		}
+		CVector adjustedFootPosL = footPosL;
+		adjustedFootPosL.z -= 0.1f;
+		adjustedFootPosL += 0.2f * forward;
+		if (bDoBloodyFootprints) {
+			CVector2D top(forward * 0.26f);
+			CVector2D right(GetRight() * 0.14f);
 
-	} else if (m_vehEnterType != 0) {
-		// Try the normal way
-		CVector pos = GetPositionToOpenCarDoor(m_pMyVehicle, m_vehEnterType);
-		newPos = pos;
-		GetMatrix().SetTranslate(newPos);
-		if (!CheckCollision()) {
-			if (CWorld::GetIsLineOfSightClear(vehPos, newPos, true, false, false, true, false, false, false))
-				foundAPos = true;
-		}
-	}
+			CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &adjustedFootPosL,
+				top.x, top.y,
+				right.x, right.y,
+				255, 255, 0, 0, 4.0f, 3000, 1.0f);
 
-	float vehRelativeExitX = vehCol->boundingBox.min.x - 0.355f;
-	if (m_vehEnterType == CAR_DOOR_RF || m_vehEnterType == CAR_DOOR_RR)
-		vehRelativeExitX = 0.355f + vehCol->boundingBox.max.x;
-
-	if (!foundAPos) {
-		// Check sides of veh., respective to seat column-veh. center difference(why?)
-		float exitOffset = vehRelativeExitX - DotProduct(ourPos - vehPos, veh->GetRight());
-		newPos = exitOffset * veh->GetRight() + ourPos;
-		GetMatrix().SetTranslate(newPos);
-		if (!CheckCollision()) {
-			if (CWorld::GetIsLineOfSightClear(vehPos, newPos, true, false, false, true, false, false, false))
-				foundAPos = true;
-		}
-	}
-	if (!foundAPos) {
-		// Iterate through sections of veh. length + static offset on X
-		float minY = vehCol->boundingBox.min.y;
-		float ySection = (vehCol->boundingBox.max.y - minY) / 3.f;
-		for (int i = 0; i < 4; i++) {
-			float fwdMult = i * ySection + minY;
-			newPos = vehRelativeExitX * veh->GetRight() + fwdMult * veh->GetForward() + vehPos;
-			GetMatrix().SetTranslate(newPos);
-			if (!CheckCollision()) {
-				if (CWorld::GetIsLineOfSightClear(vehPos, newPos, true, false, false, true, false, false, false)) {
-					foundAPos = true;
-					break;
-				}
+			if (m_bloodyFootprintCountOrDeathTime <= 20) {
+				m_bloodyFootprintCountOrDeathTime = 0;
+				bDoBloodyFootprints = false;
 			}
-		}
-	}
-	if (!foundAPos) {
-		// Back of veh.
-		newPos = (vehCol->boundingBox.min.y - 0.355f) * veh->GetForward() + vehPos;
-		GetMatrix().SetTranslate(newPos);
-		if (!CheckCollision()) {
-			if (CWorld::GetIsLineOfSightClear(vehPos, newPos, true, false, false, true, false, false, false))
-				foundAPos = true;
-		}
-	}
-	if (!foundAPos) {
-		// Front of veh.
-		newPos = (0.355f + vehCol->boundingBox.max.y) * veh->GetForward() + vehPos;
-		GetMatrix().SetTranslate(newPos);
-		if (!CheckCollision()) {
-			if (CWorld::GetIsLineOfSightClear(vehPos, newPos, true, false, false, true, false, false, false))
-				foundAPos = true;
-		}
-	}
-	if (!foundAPos) {
-		// Opposite X side + back
-		newPos = vehCol->boundingBox.min.y * veh->GetForward() + vehPos - vehRelativeExitX * veh->GetRight();
-		GetMatrix().SetTranslate(newPos);
-		if (!CheckCollision()) {
-			if (CWorld::GetIsLineOfSightClear(vehPos, newPos, true, false, false, true, false, false, false))
-				foundAPos = true;
-		}
-	}
-	if (!foundAPos) {
-		// Opposite X side + front
-		newPos = vehCol->boundingBox.max.y * veh->GetForward() + vehPos - vehRelativeExitX * veh->GetRight();
-		GetMatrix().SetTranslate(newPos);
-		if (!CheckCollision()) {
-			if (CWorld::GetIsLineOfSightClear(vehPos, newPos, true, false, false, true, false, false, false))
-				foundAPos = true;
-		}
-	}
-	if (!foundAPos) {
-		// Top of veh.
-		if (veh->m_vehType == 0) {
-			newPos = vehCol->boundingBox.max.z * veh->GetUp() + vehPos;
-			newPos.z += FEET_OFFSET;
-			GetMatrix().SetTranslate(newPos);
-			if (!CheckCollision()) {
-				if (CWorld::GetIsLineOfSightClear(vehPos, newPos, true, false, false, true, false, false, false))
-					foundAPos = true;
+			else {
+				m_bloodyFootprintCountOrDeathTime -= 20;
 			}
 		}
-	}
-	m_vecMoveSpeed = CVector(0.f, 0.f, 0.f);
-	m_vecTurnSpeed = CVector(0.f, 0.f, 0.f);
-	veh->m_vecMoveSpeed = CVector(0.f, 0.f, 0.f);
-	veh->m_vecTurnSpeed = CVector(0.f, 0.f, 0.f);
-	CWorld::pIgnoreEntity = nil;
-	bUsesCollision = true;
-	bJustCheckCollision = false;
-	bDonePositionOutOfCollision = true;
-	if (foundAPos)
-		return true;
-	int foundNode = ThePaths.FindNodeClosestToCoors(vehPos, PATH_PED, 999999.9f, true, false, false, false);
-	if (foundNode < 0)
-		return false;
-	newPos = ThePaths.m_pathNodes[foundNode].GetPosition();
-	CPedPlacement::FindZCoorForPed(&newPos);
-	GetMatrix().SetTranslate(newPos);
-	SetHeading(m_pMyVehicle->GetForward().Heading());
-	return true;
-}
+		if (!isSkater) {
+			if (m_nSurfaceTouched == SURFACE_SAND || m_nSurfaceTouched == SURFACE_SAND_BEACH) {
+				CVector2D top(forward * -0.26f);
+				CVector2D right(GetRight() * 0.14f);
 
-// --MIAMI: Done
-// "Any" means he shouldn't have to be in vehicle.
-bool
-CPed::PositionAnyPedOutOfCollision(void)
-{
-	CVehicle *veh;
-	CVector posNearVeh;
-	CVector posSomewhereClose;
-	bool putNearVeh = false;
-	bool putSomewhereClose = false;
-	int smallestDistNearVeh = 999;
-	int smallestDistSomewhereClose = 999;
-
-	CVector vehPos = m_pMyVehicle->GetPosition();
-	CVector potentialPos;
-	potentialPos.y = GetPosition().y - 3.5f;
-	potentialPos.z = GetPosition().z;
-
-	for (int yTry = 0; yTry < 15; yTry++) {
-		potentialPos.x = GetPosition().x - 3.5f;
-
-		for (int xTry = 0; xTry < 15; xTry++) {
-			CPedPlacement::FindZCoorForPed(&potentialPos);
-			if (!CWorld::TestSphereAgainstWorld(potentialPos, 0.6f, this, true, false, false, true, false, false)) {
-				float potentialChangeSqr = (potentialPos - GetPosition()).MagnitudeSqr();
-				veh = (CVehicle*)CWorld::TestSphereAgainstWorld(potentialPos, 0.6f, this, false, true, false, false, false, false);
-				if (veh) {
-					if (potentialChangeSqr < smallestDistNearVeh) {
-						posNearVeh = potentialPos;
-						putNearVeh = true;
-						smallestDistNearVeh = potentialChangeSqr;
-					}
-				} else if (potentialChangeSqr < smallestDistSomewhereClose) {
-					smallestDistSomewhereClose = potentialChangeSqr;
-					posSomewhereClose = potentialPos;
-					putSomewhereClose = true;
-				}
+				CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpShadowPedTex, &adjustedFootPosL,
+					top.x, top.y,
+					right.x, right.y,
+					120, 250, 250, 50, 4.0f, 5000, 1.0f);
 			}
-			potentialPos.x += 0.5f;
 		}
-		potentialPos.y += 0.5f;
-	}
-
-	if (!putSomewhereClose && !putNearVeh)
-		return false;
-
-	// We refrain from using posNearVeh, probably because of it may be top of the vehicle.
-	if (putSomewhereClose) {
-		SetPosition(posSomewhereClose);
-	} else {
-		CVector vehSize = veh->GetModelInfo()->GetColModel()->boundingBox.max;
-		posNearVeh.z += vehSize.z;
-		SetPosition(posNearVeh);
-	}
-	return true;
-}
-
-// --MIAMI: Done
-bool
-CPed::PossiblyFindBetterPosToSeekCar(CVector *pos, CVehicle *veh)
-{
-	bool foundIt = false;
-
-	CVector helperPos = GetPosition();
-	helperPos.z = pos->z - 0.5f;
-
-	CVector foundPos = *pos;
-	foundPos.z -= 0.5f;
-
-	// If there is another car between target car and us.
-	if (CWorld::TestSphereAgainstWorld((foundPos + helperPos) / 2.0f, 0.25f, veh, false, true, false, false, false, false)) {
-
-		CColModel *vehCol = veh->GetModelInfo()->GetColModel();
-		CVector *colMin = &vehCol->boundingBox.min;
-		CVector *colMax = &vehCol->boundingBox.max;
-
-		CVector leftRearPos = CVector(colMin->x - 0.5f, colMin->y - 0.5f, 0.0f);
-		CVector rightRearPos = CVector(0.5f + colMax->x, colMin->y - 0.5f, 0.0f);
-		CVector leftFrontPos = CVector(colMin->x - 0.5f, 0.5f + colMax->y, 0.0f);
-		CVector rightFrontPos = CVector(0.5f + colMax->x, 0.5f + colMax->y, 0.0f);
-
-		leftRearPos = veh->GetMatrix() * leftRearPos;
-		rightRearPos = veh->GetMatrix() * rightRearPos;
-		leftFrontPos = veh->GetMatrix() * leftFrontPos;
-		rightFrontPos = veh->GetMatrix() * rightFrontPos;
-
-		// Makes helperPos veh-ped distance vector.
-		helperPos -= veh->GetPosition();
-
-		// ?!? I think it's absurd to use this unless another function like SeekCar finds next pos. with it and we're trying to simulate it's behaviour.
-		// On every run it returns another pos. for ped, with same distance to the veh.
-		// Sequence of positions are not guaranteed, it depends on global pos. (So sometimes it returns positions to make ped draw circle, sometimes don't)
-		helperPos = veh->GetMatrix() * helperPos;
-
-		float vehForwardHeading = veh->GetForward().Heading();
-
-		// I'm absolutely not sure about these namings.
-		// NTVF = needed turn if we're looking to vehicle front and wanna look to...
-
-		float potentialLrHeading = Atan2(leftRearPos.x - helperPos.x, leftRearPos.y - helperPos.y);
-		float NTVF_LR = CGeneral::LimitRadianAngle(potentialLrHeading - vehForwardHeading);
-
-		float potentialRrHeading = Atan2(rightRearPos.x - helperPos.x, rightRearPos.y - helperPos.y);
-		float NTVF_RR = CGeneral::LimitRadianAngle(potentialRrHeading - vehForwardHeading);
-
-		float potentialLfHeading = Atan2(leftFrontPos.x - helperPos.x, leftFrontPos.y - helperPos.y);
-		float NTVF_LF = CGeneral::LimitRadianAngle(potentialLfHeading - vehForwardHeading);
-
-		float potentialRfHeading = Atan2(rightFrontPos.x - helperPos.x, rightFrontPos.y - helperPos.y);
-		float NTVF_RF = CGeneral::LimitRadianAngle(potentialRfHeading - vehForwardHeading);
-
-		bool canHeadToLr = NTVF_LR <= -PI || NTVF_LR >= -HALFPI;
+		if(!footPosRok)
+			TransformToNode(footPosR, PED_FOOTR);
 
-		bool canHeadToRr = NTVF_RR <= HALFPI || NTVF_RR >= PI;
+		CVector adjustedFootPosR = footPosR;
+		adjustedFootPosR.z -= 0.1f;
+		adjustedFootPosR += 0.2f * forward;
 
-		bool canHeadToLf = NTVF_LF >= 0.0f || NTVF_LF <= -HALFPI;
+		if (bDoBloodyFootprints) {
+			CVector2D top(forward * 0.26f);
+			CVector2D right(GetRight() * 0.1f);
 
-		bool canHeadToRf = NTVF_RF <= 0.0f || NTVF_RF >= HALFPI;
+			CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &adjustedFootPosR,
+				top.x, top.y,
+				right.x, right.y,
+				255, 255, 0, 0, 4.0f, 3000, 1.0f);
 
-		// Only order of conditions are different among enterTypes.
-		if (m_vehEnterType == CAR_DOOR_RR) {
-			if (canHeadToRr) {
-				foundPos = rightRearPos;
-				foundIt = true;
-			} else if (canHeadToRf) {
-				foundPos = rightFrontPos;
-				foundIt = true;
-			} else if (canHeadToLr) {
-				foundPos = leftRearPos;
-				foundIt = true;
-			} else if (canHeadToLf) {
-				foundPos = leftFrontPos;
-				foundIt = true;
-			}
-		} else if(m_vehEnterType == CAR_DOOR_RF) {
-			if (canHeadToRf) {
-				foundPos = rightFrontPos;
-				foundIt = true;
-			} else if (canHeadToRr) {
-				foundPos = rightRearPos;
-				foundIt = true;
-			} else if (canHeadToLf) {
-				foundPos = leftFrontPos;
-				foundIt = true;
-			} else if (canHeadToLr) {
-				foundPos = leftRearPos;
-				foundIt = true;
-			}
-		} else if (m_vehEnterType == CAR_DOOR_LF) {
-			if (canHeadToLf) {
-				foundPos = leftFrontPos;
-				foundIt = true;
-			} else if (canHeadToLr) {
-				foundPos = leftRearPos;
-				foundIt = true;
-			} else if (canHeadToRf) {
-				foundPos = rightFrontPos;
-				foundIt = true;
-			} else if (canHeadToRr) {
-				foundPos = rightRearPos;
-				foundIt = true;
-			}
-		} else if (m_vehEnterType == CAR_DOOR_LR) {
-			if (canHeadToLr) {
-				foundPos = leftRearPos;
-				foundIt = true;
-			} else if (canHeadToLf) {
-				foundPos = leftFrontPos;
-				foundIt = true;
-			} else if (canHeadToRr) {
-				foundPos = rightRearPos;
-				foundIt = true;
-			} else if (canHeadToRf) {
-				foundPos = rightFrontPos;
-				foundIt = true;
+			if (m_bloodyFootprintCountOrDeathTime <= 20) {
+				m_bloodyFootprintCountOrDeathTime = 0;
+				bDoBloodyFootprints = false;
+			} else {
+				m_bloodyFootprintCountOrDeathTime -= 20;
 			}
 		}
-	}
-	if (!foundIt)
-		return false;
-
-	helperPos = GetPosition() - foundPos;
-	helperPos.z = 0.0f;
-	if (helperPos.MagnitudeSqr() <= sq(0.5f))
-		return false;
-
-	pos->x = foundPos.x;
-	pos->y = foundPos.y;
-	return true;
-}
-
-CVector vecTestTemp(-1.0f, -1.0f, -1.0f);
-
-// --MIAMI: Done
-void
-CPed::Render(void)
-{
-	if (bInVehicle && m_pMyVehicle && m_nPedState != PED_EXIT_CAR && m_nPedState != PED_DRAG_FROM_CAR) {
-		if (!bRenderPedInCar)
-			return;
-
-		if (!m_pMyVehicle->IsBike() && !IsPlayer()) {
-			float camDistSq = (TheCamera.GetPosition() - GetPosition()).MagnitudeSqr();
-			if (camDistSq > SQR((m_pMyVehicle->IsBoat() ? 40.0f : 25.0f) * TheCamera.LODDistMultiplier))
-				return;
-		}
-	}
-
-	CEntity::Render();
-
-	if(m_pWeaponModel){
-		RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
-		int idx = RpHAnimIDGetIndex(hier, m_pFrames[PED_HANDR]->nodeID);
-		RwMatrix *mat = &RpHAnimHierarchyGetMatrixArray(hier)[idx];
-		RwFrame *frame = RpAtomicGetFrame(m_pWeaponModel);
-		*RwFrameGetMatrix(frame) = *mat;
-		RwFrameUpdateObjects(frame);
-		RpAtomicRender(m_pWeaponModel);
-		if (IsPlayer()) {
-			CPlayerPed *player = (CPlayerPed*)this;
-			if (player->m_pMinigunTopAtomic) {
-				frame = RpAtomicGetFrame(player->m_pMinigunTopAtomic);
-				*RwFrameGetMatrix(frame) = *mat;
-
-				player->m_fGunSpinAngle = player->m_fGunSpinSpeed * CTimer::GetTimeStep() + player->m_fGunSpinAngle;
-				if (player->m_fGunSpinAngle > TWOPI)
-					player->m_fGunSpinAngle -= TWOPI;
-
-				CMatrix mgTopMat, localAdjMat;
-				mgTopMat.Attach(RwFrameGetMatrix(frame));
-				localAdjMat.SetRotateX(player->m_fGunSpinAngle);
-				localAdjMat.Rotate(DEGTORAD(-4.477f)* vecTestTemp.x, DEGTORAD(29.731f) * vecTestTemp.y, DEGTORAD(1.064f) * vecTestTemp.z);
-				localAdjMat.GetPosition() += CVector(0.829f, -0.001f, 0.226f);
-				mgTopMat = mgTopMat * localAdjMat;
-				mgTopMat.UpdateRW();
+		if (!isSkater) {
+			if (m_nSurfaceTouched == SURFACE_SAND || m_nSurfaceTouched == SURFACE_SAND_BEACH) {
+				CVector2D top(forward * -0.26f);
+				CVector2D right(GetRight() * 0.14f);
 
-				RwFrameUpdateObjects(frame);
-				RpAtomicRender(player->m_pMinigunTopAtomic);
+				CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpShadowPedTex, &adjustedFootPosR,
+					top.x, top.y,
+					right.x, right.y,
+					120, 250, 250, 50, 4.0f, 5000, 1.0f);
 			}
 		}
 	}
-}
-
-// --MIAMI: Done
-void
-CPed::ProcessObjective(void)
-{
-	if (bClearObjective && (IsPedInControl() || m_nPedState == PED_DRIVING)) {
-		ClearObjective();
-		bClearObjective = false;
-	}
-	UpdateFromLeader();
-
-	CVector carOrOurPos;
-	CVector targetCarOrHisPos;
-	CVector distWithTarget;
-
-	if (m_objective != OBJECTIVE_NONE && (IsPedInControl() || m_nPedState == PED_DRIVING)) {
-		if (bInVehicle) {
-			if (!m_pMyVehicle) {
-				bInVehicle = false;
-				return;
-			}
-			carOrOurPos = m_pMyVehicle->GetPosition();
-		} else {
-			carOrOurPos = GetPosition();
-		}
-
-		if (m_pedInObjective) {
-			if (m_pedInObjective->InVehicle() && m_pedInObjective->m_nPedState != PED_DRAG_FROM_CAR) {
-				targetCarOrHisPos = m_pedInObjective->m_pMyVehicle->GetPosition();
-			} else {
-				targetCarOrHisPos = m_pedInObjective->GetPosition();
-			}
-			distWithTarget = targetCarOrHisPos - carOrOurPos;
-		} else if (m_carInObjective) {
-			targetCarOrHisPos = m_carInObjective->GetPosition();
-			distWithTarget = targetCarOrHisPos - carOrOurPos;
-		}
-
-		switch (m_objective) {
-			case OBJECTIVE_WAIT_ON_FOOT:
-				if (GetPedState() == PED_DRIVING)
-					m_objective = OBJECTIVE_NONE;
-				else {
-					SetIdle();
-					if (m_attractor) {
-						if (m_objectiveTimer && CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-							GetPedAttractorManager()->BroadcastDeparture(this, m_attractor);
-							m_objectiveTimer = 0;
-						}
-					} else {
-						m_objective = OBJECTIVE_NONE;
-						SetMoveState(PEDMOVE_STILL);
-					}
-				}
-				break;
-			case OBJECTIVE_WAIT_ON_FOOT_FOR_COP:
-				if (!m_pedInObjective) {
-					m_objective = OBJECTIVE_NONE;
-					SetWanderPath(CGeneral::GetRandomNumberInRange(0.f, 8.f));
-				} else if (m_pedInObjective->m_nPedType == PEDTYPE_COP && m_pedInObjective->m_nPedState == PED_DEAD) {
-					m_objective = OBJECTIVE_NONE;
-					SetWanderPath(CGeneral::GetRandomNumberInRange(0.f, 8.f));
-					m_pedInObjective = nil;
-				}
-				break;
-			case OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE:
-				if (m_leaveCarTimer >= CTimer::GetTimeInMilliseconds())
-					break;
-
-				if (InVehicle()) {
-					SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
-					bFleeAfterExitingCar = true;
-				} else if (m_nPedState != PED_FLEE_POS) {
-					CVector2D fleePos = GetPosition();
-					SetFlee(fleePos, 10000);
-					bUsePedNodeSeek = true;
-					m_pNextPathNode = nil;
-				}
-				break;
-			case OBJECTIVE_GUARD_SPOT:
-			{
-				distWithTarget = m_vecSpotToGuard - GetPosition();
-				if (m_pedInObjective) {
-					SetLookFlag(m_pedInObjective, true);
-					m_pLookTarget = m_pedInObjective;
-					m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
-					TurnBody();
-				}
-				float distWithTargetSc = distWithTarget.Magnitude();
-				if (2.0f * m_radiusToGuard >= distWithTargetSc) {
-					if (m_pedInObjective && m_pedInObjective->m_nPedState != PED_DEAD) {
-						if (distWithTargetSc <= m_radiusToGuard)
-							SetIdle();
-						else {
-							CVector seekPos = m_vecSpotToGuard;
-							SetSeek(seekPos, m_radiusToGuard);
-						}
-					} else if (CTimer::GetTimeInMilliseconds() > m_lookTimer) {
-						int threatType = ScanForThreats();
-						SetLookTimer(CGeneral::GetRandomNumberInRange(500, 1500));
-
-						// Second condition is pointless and isn't there in Mobile.
-						if (threatType == PED_FLAG_GUN || (threatType == PED_FLAG_EXPLOSION && m_threatEntity) || m_threatEntity) {
-							if (m_threatEntity->IsPed())
-								SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, m_threatEntity);
-						}
-					}
-				} else {
-					CVector seekPos = m_vecSpotToGuard;
-					SetSeek(seekPos, m_radiusToGuard);
-				}
-				break;
-			}
-			case OBJECTIVE_WAIT_IN_CAR:
-				SetPedState(PED_DRIVING);
-				break;
-			case OBJECTIVE_WAIT_IN_CAR_THEN_GET_OUT:
-				SetPedState(PED_DRIVING);
-				break;
-			case OBJECTIVE_KILL_CHAR_ANY_MEANS:
-			{
-				if (m_pedInObjective) {
-					if (m_pedInObjective->IsPlayer() && CharCreatedBy != MISSION_CHAR
-						&& m_nPedType != PEDTYPE_COP && FindPlayerPed()->m_pWanted->m_CurrentCops != 0
-						&& !bKindaStayInSamePlace) {
-
-						SetObjective(OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE);
-						break;
-					}
-					if (InVehicle()) {
-						if (distWithTarget.Magnitude() >= 20.0f || m_pMyVehicle->m_vecMoveSpeed.MagnitudeSqr() >= sq(0.02f)) {
-
-							if (((m_pMyVehicle->pDriver == this && m_pMyVehicle->AutoPilot.m_nCarMission == MISSION_NONE) || m_pMyVehicle->AutoPilot.m_nCarMission == MISSION_CRUISE)
-								&& !m_pMyVehicle->m_nGettingInFlags) {
-								m_pMyVehicle->SetStatus(STATUS_PHYSICS);
-								m_pMyVehicle->AutoPilot.m_nPrevRouteNode = 0;
-								if (m_nPedType == PEDTYPE_COP) {
-									m_pMyVehicle->AutoPilot.m_nCruiseSpeed = (FindPlayerPed()->m_pWanted->m_nWantedLevel * 0.1f + 0.6f) * (GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fUnkMaxVelocity);
-									m_pMyVehicle->AutoPilot.m_nCarMission = CCarAI::FindPoliceCarMissionForWantedLevel();
-								} else {
-									m_pMyVehicle->AutoPilot.m_nCruiseSpeed = GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fUnkMaxVelocity * 0.8f;
-									m_pMyVehicle->AutoPilot.m_nCarMission = MISSION_RAMPLAYER_FARAWAY;
-								}
-								m_pMyVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
-							}
-						} else {
-							bool targetHasVeh = m_pedInObjective->bInVehicle;
-							if (!targetHasVeh || targetHasVeh && m_pedInObjective->m_pMyVehicle->CanPedExitCar(false)) {
-								m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
-								m_pMyVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
-								SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
-							}
-						}
-						break;
-					}
-					if (distWithTarget.Magnitude() > 30.0f && !bKindaStayInSamePlace) {
-						if (m_pMyVehicle) {
-							m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
-							SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, m_pMyVehicle);
-						} else {
-							float closestVehDist = 60.0f;
-							int16 lastVehicle;
-							CEntity* vehicles[8];
-							CWorld::FindObjectsInRange(GetPosition(), ENTER_CAR_MAX_DIST, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
-							CVehicle *foundVeh = nil;
-							for(int i = 0; i < lastVehicle; i++) {
-								CVehicle *nearVeh = (CVehicle*)vehicles[i];
-								/*
-								Not used.
-								CVector vehSpeed = nearVeh->GetSpeed();
-								CVector ourSpeed = GetSpeed();
-								*/
-								CVector vehDistVec = nearVeh->GetPosition() - GetPosition();
-								if (vehDistVec.Magnitude() < closestVehDist && m_pedInObjective->m_pMyVehicle != nearVeh
-									&& nearVeh->CanPedOpenLocks(this) && nearVeh->m_fHealth > 250.f) {
-
-									foundVeh = nearVeh;
-									closestVehDist = vehDistVec.Magnitude();
-								}
-							}
-							m_pMyVehicle = foundVeh;
-							if (m_pMyVehicle) {
-								m_pMyVehicle->RegisterReference((CEntity **) &m_pMyVehicle);
-								m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
-								SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, m_pMyVehicle);
-							} else if (!GetIsOnScreen()) {
-								CVector ourPos = GetPosition();
-								int closestNode = ThePaths.FindNodeClosestToCoors(ourPos, PATH_CAR, 20.0f);
-								if (closestNode >= 0) {
-									int16 colliding;
-									CWorld::FindObjectsKindaColliding(
-										ThePaths.m_pathNodes[closestNode].GetPosition(), 10.0f, true, &colliding, 2, nil, false, true, true, false, false);
-									if (!colliding) {
-										CZoneInfo zoneInfo;
-										int chosenCarClass;
-										CTheZones::GetZoneInfoForTimeOfDay(&ourPos, &zoneInfo);
-										int chosenModel = CCarCtrl::ChooseModel(&zoneInfo, &chosenCarClass);
-										CVehicle *newVeh = nil;
-										if (chosenModel != -1) {
-											if (CModelInfo::IsBikeModel(chosenModel)) {
-												newVeh = new CBike(chosenModel, RANDOM_VEHICLE);
-											} else {
-												newVeh = new CAutomobile(chosenModel, RANDOM_VEHICLE);
-											}
-										}
-										if (newVeh) {
-											newVeh->GetMatrix().GetPosition() = ThePaths.m_pathNodes[closestNode].GetPosition();
-											newVeh->GetMatrix().GetPosition().z += 4.0f;
-											newVeh->SetHeading(DEGTORAD(200.0f));
-											newVeh->SetStatus(STATUS_ABANDONED);
-											newVeh->m_nDoorLock = CARLOCK_UNLOCKED;
-											CWorld::Add(newVeh);
-											m_pMyVehicle = newVeh;
-											if (m_pMyVehicle) {
-												m_pMyVehicle->RegisterReference((CEntity **) &m_pMyVehicle);
-												m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
-												SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, m_pMyVehicle);
-											}
-										}
-									}
-								}
-							}
-						}
-						break;
-					}
-				} else {
-					ClearLookFlag();
-					bObjectiveCompleted = true;
-				}
-			}
-			case OBJECTIVE_KILL_CHAR_ON_FOOT:
-			{
-				if (m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT && InVehicle()) {
-					SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
-					break;
-				}
-				if (!m_pedInObjective || m_pedInObjective->DyingOrDead()) {
-					bObjectiveCompleted = true;
-					ClearLookFlag();
-					SetMoveAnim();
-					break;
-				}
-				if (m_pedInObjective) {
-					int status;
-					if (GetWeapon()->IsTypeMelee())
-						status = KillCharOnFootMelee(carOrOurPos, targetCarOrHisPos, distWithTarget);
-					else
-						status = KillCharOnFootArmed(carOrOurPos, targetCarOrHisPos, distWithTarget);
-
-					if (status == WATCH_UNTIL_HE_DISAPPEARS)
-						return;
-					if (status == CANT_ATTACK)
-						break;
-				}
-				SetMoveAnim();
-				break;
-			}
-			case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
-			case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
-			{
-				if (InVehicle()) {
-					if (m_nPedState == PED_DRIVING)
-						SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
-				} else if (m_nPedState != PED_FLEE_ENTITY) {
-					int time;
-					if (m_objective == OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS)
-						time = 0;
-					else
-						time = 6000;
-
-					SetFindPathAndFlee(m_pedInObjective, time);
-					if (m_pedStats == CPedStats::ms_apPedStats[PEDSTAT_FIREMAN])
-						bMakeFleeScream = true;
-				}
-				break;
-			}
-			case OBJECTIVE_GOTO_CHAR_ON_FOOT:
-			case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
-			case OBJECTIVE_HASSLE_CHAR:
-			{
-				if (m_pedInObjective) {
-					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()) {
-						if (distWithTargetSc <= safeDistance) {
-							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();
-							}
-							if (distWithTargetSc > 2.0f)
-								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) {
-								if (m_leader && m_leader->m_nMoveState == PEDMOVE_SPRINT)
-									SetMoveState(PEDMOVE_SPRINT);
-								else
-									SetMoveState(PEDMOVE_RUN);
-							} else {
-								if (m_leader && m_leader->m_nMoveState != PEDMOVE_STILL
-									&& m_leader->m_nMoveState != PEDMOVE_NONE) {
-									if (m_leader->IsPlayer()) {
-										if (distWithTargetSc >= 3.0f && FindPlayerPed()->m_fMoveSpeed >= 1.3f)
-											SetMoveState(PEDMOVE_RUN);
-										else
-											SetMoveState(PEDMOVE_WALK);
-									} else {
-										SetMoveState(m_leader->m_nMoveState);
-									}
-								} else if (distWithTargetSc <= 3.0f) {
-									SetMoveState(PEDMOVE_WALK);
-								} else {
-									SetMoveState(PEDMOVE_RUN);
-								}
-							}
-						}
-						if (m_objective == OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING && m_nMoveState > PEDMOVE_STILL)
-							SetMoveState(PEDMOVE_WALK);
-					}
-				} else {
-					SetObjective(OBJECTIVE_NONE);
-				}
-				break;
-			}
-			case OBJECTIVE_FOLLOW_CHAR_IN_FORMATION:
-			{
-				if (m_pedInObjective) {
-					CVector posToGo = GetFormationPosition();
-					distWithTarget = posToGo - carOrOurPos;
-					SetSeek(posToGo, 1.0f);
-					if (distWithTarget.Magnitude() <= 3.0f) {
-						SetSeek(posToGo, 1.0f);
-						if (m_pedInObjective && m_pedInObjective->m_nMoveState != PEDMOVE_STILL)
-							SetMoveState(m_pedInObjective->m_nMoveState);
-					} else {
-						SetSeek(posToGo, 1.0f);
-						SetMoveState(PEDMOVE_RUN);
-					}
-				} else {
-					SetObjective(OBJECTIVE_NONE);
-				}
-				break;
-			}
-			case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
-			{
-				if (m_carInObjective) {
-					if (!bInVehicle && m_carInObjective->m_nNumPassengers >= m_carInObjective->m_nNumMaxPassengers) {
-						RestorePreviousObjective();
-						RestorePreviousState();
-						if (IsPedInControl())
-							m_pMyVehicle = nil;
-
-						break;
-					}
-
-					if (m_prevObjective == OBJECTIVE_HAIL_TAXI && !((CAutomobile*)m_carInObjective)->bTaxiLight) {
-						RestorePreviousObjective();
-						ClearObjective();
-						SetWanderPath(CGeneral::GetRandomNumber() & 7);
-						bIsRunning = false;
-						break;
-					}
-					if (m_objectiveTimer && m_objectiveTimer < CTimer::GetTimeInMilliseconds()) {
-						if (!EnteringCar()) {
-							bool foundSeat = false;
-							if (m_carInObjective->IsBike()) {
-								if (!m_carInObjective->pPassengers[0] && !(m_carInObjective->m_nGettingInFlags & (CAR_DOOR_FLAG_RR | CAR_DOOR_FLAG_LR))) {
-									m_vehEnterType = CAR_DOOR_RR;
-									foundSeat = true;
-								}
-							} else {
-								if (m_carInObjective->pPassengers[0] || m_carInObjective->m_nGettingInFlags & CAR_DOOR_FLAG_RF) {
-									if (m_carInObjective->pPassengers[1] || m_carInObjective->m_nGettingInFlags & CAR_DOOR_FLAG_LR) {
-										if (m_carInObjective->pPassengers[2] || m_carInObjective->m_nGettingInFlags & CAR_DOOR_FLAG_RR) {
-											foundSeat = false;
-										} else {
-											m_vehEnterType = CAR_DOOR_RR;
-											foundSeat = true;
-										}
-									} else {
-										m_vehEnterType = CAR_DOOR_LR;
-										foundSeat = true;
-									}
-								} else {
-									m_vehEnterType = CAR_DOOR_RF;
-									foundSeat = true;
-								}
-							}
-							for (int i = 2; i < m_carInObjective->m_nNumMaxPassengers; ++i) {
-								if (!m_carInObjective->pPassengers[i] && !(m_carInObjective->m_nGettingInFlags & CAR_DOOR_FLAG_RF)) {
-									m_vehEnterType = CAR_DOOR_RF;
-									foundSeat = true;
-								}
-							}
-							if (foundSeat) {
-								SetPosition(GetPositionToOpenCarDoor(m_carInObjective, m_vehEnterType));
-								SetEnterCar(m_carInObjective, m_vehEnterType);
-							}
-						}
-						m_objectiveTimer = 0;
-					}
-				}
-				// fall through
-			}
-			case OBJECTIVE_ENTER_CAR_AS_DRIVER:
-			{
-				if (!m_carInObjective || bInVehicle) {
-					if (bInVehicle && m_pMyVehicle != m_carInObjective) {
-						SetExitCar(m_pMyVehicle, 0);
-					} else {
-						bObjectiveCompleted = true;
-						bScriptObjectiveCompleted = true;
-						RestorePreviousState();
-					}
-				} else {
-					if (m_leaveCarTimer > CTimer::GetTimeInMilliseconds()) {
-						SetMoveState(PEDMOVE_STILL);
-						break;
-					}
-					if (IsPedInControl()) {
-						if (m_prevObjective == OBJECTIVE_KILL_CHAR_ANY_MEANS) {
-							if (distWithTarget.Magnitude() < 20.0f) {
-								RestorePreviousObjective();
-								RestorePreviousState();
-								return;
-							}
-							if (m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
-								if (m_carInObjective->pDriver && !IsPlayer()) {
-									if (m_carInObjective->pDriver->m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS && m_carInObjective->pDriver != m_pedInObjective) {
-										SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, m_carInObjective);
-										m_carInObjective->bIsBeingCarJacked = false;
-									}
-								}
-							}
-						} else if (m_objective != OBJECTIVE_ENTER_CAR_AS_PASSENGER) {
-							if (m_carInObjective->pDriver
-								&& (CharCreatedBy != MISSION_CHAR || m_carInObjective->pDriver->CharCreatedBy != RANDOM_CHAR)
-								) {
-								if (m_carInObjective->pDriver->m_nPedType == m_nPedType) {
-									SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, m_carInObjective);
-									m_carInObjective->bIsBeingCarJacked = false;
-								}
-							}
-						}
-						if (m_carInObjective->IsUpsideDown() && m_carInObjective->m_vehType != VEHICLE_TYPE_BIKE) {
-							RestorePreviousObjective();
-							RestorePreviousState();
-							return;
-						}
-						if (!m_carInObjective->IsBoat() || m_nPedState == PED_SEEK_IN_BOAT) {
-							if (m_nPedState != PED_SEEK_CAR)
-								SetSeekCar(m_carInObjective, 0);
-						} else {
-							SetSeekBoatPosition(m_carInObjective);
-						}
-						if (m_nMoveState == PEDMOVE_STILL && !bVehEnterDoorIsBlocked)
-							SetMoveState(PEDMOVE_RUN);
 
-						if (m_carInObjective && m_carInObjective->m_fHealth > 0.0f) {
-							distWithTarget = m_carInObjective->GetPosition() - GetPosition();
-							if (!bInVehicle) {
-								if (nEnterCarRangeMultiplier * ENTER_CAR_MAX_DIST < distWithTarget.Magnitude()) {
-									if (!m_carInObjective->pDriver && !m_carInObjective->GetIsOnScreen() && !GetIsOnScreen())
-										WarpPedToNearEntityOffScreen(m_carInObjective);
-
-									if (CharCreatedBy != MISSION_CHAR || m_prevObjective == OBJECTIVE_KILL_CHAR_ANY_MEANS
-										|| IsPlayer() && !CPad::GetPad(0)->ArePlayerControlsDisabled()) {
-										RestorePreviousObjective();
-										RestorePreviousState();
-										if (IsPedInControl())
-											m_pMyVehicle = nil;
-									} else {
-										SetIdle();
-										SetMoveState(PEDMOVE_STILL);
-									}
-								}
-							}
-						} else if (!bInVehicle) {
-							RestorePreviousObjective();
-							RestorePreviousState();
-							if (IsPedInControl())
-								m_pMyVehicle = nil;
-						}
-					}
-				}
-				break;
-			}
-			case OBJECTIVE_DESTROY_OBJECT:
-				if (m_pPointGunAt) {
-					if (m_nPedState != PED_ATTACK)
-						SetAttack(m_pPointGunAt);
-				} else {
-					bScriptObjectiveCompleted = true;
-					RestorePreviousObjective();
-				}
-				break;
-			case OBJECTIVE_DESTROY_CAR:
-			{
-				if (!m_carInObjective) {
-					ClearLookFlag();
-					bObjectiveCompleted = true;
-					break;
-				}
-				float distWithTargetSc = distWithTarget.Magnitude();
-				CWeaponInfo *wepInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-				float wepRange = wepInfo->m_fRange;
-				m_pLookTarget = m_carInObjective;
-				m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
-
-				m_pSeekTarget = m_carInObjective;
-				m_pSeekTarget->RegisterReference((CEntity**) &m_pSeekTarget);
-
-				TurnBody();
-				if (m_carInObjective->m_fHealth <= 0.0f) {
-					ClearLookFlag();
-					bScriptObjectiveCompleted = true;
-					break;
-				}
+	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) {
+			float particleSize = pedSpeed * 2.0f;
 
-				if (m_attackTimer < CTimer::GetTimeInMilliseconds() && distWithTargetSc < wepRange) {
-					// I hope so
-					CVector ourHead = GetMatrix() * CVector(0.5f, 0.0f, 0.6f);
-					CVector maxShotPos = m_carInObjective->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 == m_carInObjective) {
-						SetAttack(m_carInObjective);
-						if (m_pPointGunAt)
-							m_pPointGunAt->CleanUpOldReference((CEntity**)&m_pPointGunAt);
-						m_pPointGunAt = m_carInObjective;
-						if (m_pPointGunAt)
-							m_pPointGunAt->RegisterReference((CEntity **) &m_pPointGunAt);
-
-						SetShootTimer(CGeneral::GetRandomNumberInRange(500, 2000));
-						if (distWithTargetSc > 10.0f && !bKindaStayInSamePlace) {
-							SetAttackTimer(CGeneral::GetRandomNumberInRange(2000, 5000));
-						} else {
-							SetAttackTimer(CGeneral::GetRandomNumberInRange(50, 300));
-							SetMoveState(PEDMOVE_STILL);
-						}
-					}
-				} else if (m_nPedState != PED_ATTACK && !bKindaStayInSamePlace) {
-					if (wepRange <= 5.0f) {
-						if (Abs(distWithTarget.x) > wepRange || Abs(distWithTarget.y) > wepRange ||
-							(distWithTarget.z > -1.0f && distWithTarget.z < 0.3)) {
-							SetSeek(m_carInObjective, 3.0f);
-							SetMoveState(PEDMOVE_RUN);
-						} else {
-							SetIdle();
-						}
-					} else {
-						float safeDistance = wepRange * 0.25f;
+			if (particleSize < 0.25f)
+				particleSize = 0.25f;
 
-						SetSeek(m_carInObjective, safeDistance);
-						SetMoveState(PEDMOVE_RUN);
-					}
-				}
-				SetLookFlag(m_carInObjective, false);
-				TurnBody();
-				break;
-			}
-			case OBJECTIVE_GOTO_AREA_ON_FOOT:
-			case OBJECTIVE_RUN_TO_AREA:
-			case OBJECTIVE_SPRINT_TO_AREA:
-			{
-				if (InVehicle()) {
-					SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
-				} else {
-					distWithTarget = m_nextRoutePointPos - GetPosition();
-					distWithTarget.z = 0.0f;
-					if (sq(m_distanceToCountSeekDone) >= distWithTarget.MagnitudeSqr()) {
-						bObjectiveCompleted = true;
-						bScriptObjectiveCompleted = true;
-						SetMoveState(PEDMOVE_STILL);
-					} else if (CTimer::GetTimeInMilliseconds() > m_nPedStateTimer || m_nPedState != PED_SEEK_POS) {
-						if (bUsePedNodeSeek) {
-							CVector bestCoords(0.0f, 0.0f, 0.0f);
-							m_vecSeekPos = m_nextRoutePointPos;
-
-							if (!m_pNextPathNode) {
-								bool found = FindBestCoordsFromNodes(m_vecSeekPos, &bestCoords);
-								if (m_pNextPathNode) {
-									// Because it already does that if it finds better coords.
-									if (!found) {
-										bestCoords = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
-									}
-									if ((bestCoords - GetPosition()).Magnitude2D() < m_distanceToCountSeekDone) {
-										m_pNextPathNode = nil;
-										bUsePedNodeSeek = false;
-									}
-								}
-							}
-							if (m_pNextPathNode)
-								m_vecSeekPos = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
-						}
-						CVector seekPos = m_vecSeekPos;
-						SetSeek(m_vecSeekPos, m_distanceToCountSeekDone);
-					}
-				}
+			if (particleSize > 0.75f)
+				particleSize = 0.75f;
 
-				break;
-			}
-			case OBJECTIVE_GUARD_ATTACK:
-			{
-				if (m_pedInObjective) {
-					SetLookFlag(m_pedInObjective, true);
-					m_pLookTarget = m_pedInObjective;
-					m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
-					m_lookTimer = m_attackTimer;
-					TurnBody();
-					float distWithTargetSc = distWithTarget.Magnitude();
-					if (distWithTargetSc >= 20.0f) {
-						RestorePreviousObjective();
-					} else if (m_attackTimer < CTimer::GetTimeInMilliseconds()) {
-						if (m_nPedState != PED_SEEK_ENTITY && distWithTargetSc >= 2.0f) {
-							SetSeek(m_pedInObjective, 1.0f);
-						} else {
-							SetAttack(m_pedInObjective);
-							SetShootTimer(CGeneral::GetRandomNumberInRange(500.0f, 1500.0f));
-						}
-						SetAttackTimer(1000);
-					}
-				} else {
-					RestorePreviousObjective();
-				}
-				break;
-			}
-			case OBJECTIVE_FOLLOW_ROUTE:
-				if (HaveReachedNextPointOnRoute(1.0f)) {
-					int nextPoint = GetNextPointOnRoute();
-					m_nextRoutePointPos = CRouteNode::GetPointPosition(nextPoint);
-				} else {
-					CVector seekPos = m_nextRoutePointPos;
-					SetSeek(seekPos, 0.8f);
-				}
-				break;
-			case OBJECTIVE_SOLICIT_VEHICLE:
-				if (m_carInObjective) {
-					if (m_objectiveTimer <= CTimer::GetTimeInMilliseconds()) {
-						if (!bInVehicle) {
-							SetObjective(OBJECTIVE_NONE);
-							SetWanderPath(CGeneral::GetRandomNumber() & 7);
-							m_objectiveTimer = CTimer::GetTimeInMilliseconds() + 10000;
-							if (IsPedInControl())
-								m_pMyVehicle = nil;
-						}
-					} else {
-						if (m_nPedState != PED_FLEE_ENTITY && m_nPedState != PED_SOLICIT)
-							SetSeekCar(m_carInObjective, 0);
-					}
-				} else {
-					RestorePreviousObjective();
-					RestorePreviousState();
-					if (IsPedInControl())
-						m_pMyVehicle = nil;
-				}
-				break;
-			case OBJECTIVE_HAIL_TAXI:
-				if (!RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_TAXI) && CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-					Say(SOUND_PED_TAXI_WAIT);
-					CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_TAXI, 4.0f);
-					m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 2000;
-				}
-				break;
-			case OBJECTIVE_CATCH_TRAIN:
-			{
-				if (m_carInObjective) {
-					SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, m_carInObjective);
-				} else {
-					CVehicle* trainToEnter = nil;
-					float closestCarDist = CHECK_NEARBY_THINGS_MAX_DIST;
-					CVector pos = GetPosition();
-					int16 lastVehicle;
-					CEntity* vehicles[8];
-
-					CWorld::FindObjectsInRange(pos, 10.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
-					for (int i = 0; i < lastVehicle; i++) {
-						CVehicle* nearVeh = (CVehicle*)vehicles[i];
-						if (nearVeh->IsTrain()) {
-							CVector vehDistVec = GetPosition() - nearVeh->GetPosition();
-							float vehDist = vehDistVec.Magnitude();
-							if (vehDist < closestCarDist && m_pedInObjective->m_pMyVehicle != nearVeh)
-							{
-								trainToEnter = nearVeh;
-								closestCarDist = vehDist;
-							}
-						}
-					}
-					if (trainToEnter) {
-						m_carInObjective = trainToEnter;
-						m_carInObjective->RegisterReference((CEntity **) &m_carInObjective);
-					}
-				}
-				break;
-			}
-			case OBJECTIVE_BUY_ICE_CREAM:
-				if (m_carInObjective) {
-					if (m_nPedState != PED_FLEE_ENTITY && m_nPedState != PED_BUY_ICECREAM && m_nPedState != PED_CHAT)
-						SetSeekCar(m_carInObjective, 0);
-				}
-				break;
-			case OBJECTIVE_STEAL_ANY_CAR:
-			case OBJECTIVE_STEAL_ANY_MISSION_CAR:
-			{
-				if (bInVehicle) {
-					bScriptObjectiveCompleted = true;
-					RestorePreviousObjective();
-				} else if (m_hitRecoverTimer < CTimer::GetTimeInMilliseconds()) {
-					CVehicle *carToSteal = nil;
-					float closestCarDist = nEnterCarRangeMultiplier * ENTER_CAR_MAX_DIST;
-					CVector pos = GetPosition();
-					int16 lastVehicle;
-					CEntity *vehicles[8];
-
-					CWorld::FindObjectsInRange(pos, closestCarDist, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
-					for(int i = 0; i < lastVehicle; i++) {
-						CVehicle *nearVeh = (CVehicle*)vehicles[i];
-						if (m_objective == OBJECTIVE_STEAL_ANY_MISSION_CAR || nearVeh->VehicleCreatedBy != MISSION_VEHICLE) {
-							if (nearVeh->m_vecMoveSpeed.Magnitude() <= 0.1f) {
-								if (nearVeh->CanPedOpenLocks(this)) {
-									CVector vehDistVec = GetPosition() - nearVeh->GetPosition();
-									float vehDist = vehDistVec.Magnitude();
-									if (vehDist < closestCarDist) {
-										carToSteal = nearVeh;
-										closestCarDist = vehDist;
-									}
-								}
-							}
-						}
-					}
-					if (carToSteal) {
-						SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, carToSteal);
-						m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 5000;
-					} else {
-						RestorePreviousObjective();
-						RestorePreviousState();
-					}
-				}
-				break;
-			}
-			case OBJECTIVE_MUG_CHAR:
-			{
-				if (m_pedInObjective) {
-					if (m_pedInObjective->IsPlayer() || m_pedInObjective->bInVehicle || m_pedInObjective->m_fHealth <= 0.0f) {
-						ClearObjective();
-						return;
-					}
-					if (m_pedInObjective->m_nMoveState > PEDMOVE_WALK) {
-						ClearObjective();
-						return;
-					}
-					if (m_pedInObjective->m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT && m_pedInObjective->m_pedInObjective == this) {
-						SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, m_pedInObjective);
-						SetMoveState(PEDMOVE_SPRINT);
-						return;
-					}
-					if (m_pedInObjective->m_nPedState == PED_FLEE_ENTITY && m_fleeFrom == this
-						|| m_pedInObjective->m_objective == OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE && m_pedInObjective->m_pedInObjective == this) {
-						ClearObjective();
-						SetFindPathAndFlee(m_pedInObjective, 15000, true);
-						return;
-					}
-					float distWithTargetScSqr = distWithTarget.MagnitudeSqr();
-					if (distWithTargetScSqr <= sq(10.0f)) {
-						if (distWithTargetScSqr <= sq(1.4f)) {
-							CAnimBlendAssociation *reloadAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FUCKU);
-							m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
-								m_pedInObjective->GetPosition().x, m_pedInObjective->GetPosition().y,
-								GetPosition().x, GetPosition().y);
-
-							if (reloadAssoc || !m_pedInObjective->IsPedShootable()) {
-								if (reloadAssoc &&
-									(!reloadAssoc->IsRunning() || reloadAssoc->GetProgress() > 0.8f)) {
-									CAnimBlendAssociation *punchAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT_PPUNCH, 8.0f);
-									punchAssoc->flags |= ASSOC_DELETEFADEDOUT;
-									punchAssoc->flags |= ASSOC_FADEOUTWHENDONE;
-									CVector2D offset(distWithTarget.x, distWithTarget.y);
-									int dir = m_pedInObjective->GetLocalDirection(offset);
-									m_pedInObjective->StartFightDefend(dir, HITLEVEL_HIGH, 5);
-									m_pedInObjective->ReactToAttack(this);
-									m_pedInObjective->Say(SOUND_PED_ROBBED);
-									Say(SOUND_PED_MUGGING);
-									bRichFromMugging = true;
-
-									// VC FIX: ClearObjective() clears m_pedInObjective in VC (also same with VC_PED_PORTS), so get it before call
-									CPed *victim = m_pedInObjective;
-									ClearObjective();
-									if (victim->m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT
-										|| victim->m_pedInObjective != this) {
-										SetFindPathAndFlee(victim, 15000, true);
-										m_nLastPedState = PED_WANDER_PATH;
-									} else {
-										SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, victim);
-										SetMoveState(PEDMOVE_SPRINT);
-										m_nLastPedState = PED_WANDER_PATH;
-									}
-								}
-							} else {
-								eWeaponType weaponType = GetWeapon()->m_eWeaponType;
-								if (weaponType != WEAPONTYPE_UNARMED && weaponType != WEAPONTYPE_BASEBALLBAT)
-									SetCurrentWeapon(WEAPONTYPE_UNARMED);
+			CVector particlePos = GetPosition() + GetForward() * 0.3f;
+			particlePos.z -= 1.2f;
 
-								CAnimBlendAssociation *newReloadAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FUCKU, 8.0f);
-								newReloadAssoc->flags |= ASSOC_DELETEFADEDOUT;
-								newReloadAssoc->flags |= ASSOC_FADEOUTWHENDONE;
-							}
-						} else {
-							SetSeek(m_pedInObjective, 1.0f);
-							CAnimBlendAssociation *walkAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WALK);
+			CVector particleDir = m_vecMoveSpeed * -0.75f;
 
-							if (walkAssoc)
-								walkAssoc->speed = 1.3f;
-						}
-					} else {
-						ClearObjective();
-						SetWanderPath(CGeneral::GetRandomNumber() & 7);
-					}
-				} else {
-					m_objective = OBJECTIVE_NONE;
-					ClearObjective();
-				}
-			}
-			// fall through
-			case OBJECTIVE_WANDER:
-				if (CTimer::GetTimeInMilliseconds() > m_leaveCarTimer && !bInVehicle) {
-					m_leaveCarTimer = 0;
-					m_objective = OBJECTIVE_NONE;
-					SetWanderPath(m_nPathDir);
-				}
-				break;
-			case OBJECTIVE_LEAVE_CAR_AND_DIE:
-			{
-				if (CTimer::GetTimeInMilliseconds() > m_leaveCarTimer) {
-					if (InVehicle()) {
-						if (m_nPedState != PED_EXIT_CAR && m_nPedState != PED_DRAG_FROM_CAR && m_nPedState != PED_EXIT_TRAIN) {
-							if (m_pMyVehicle->IsBoat())
-								SetExitBoat(m_pMyVehicle);
-							else if (m_pMyVehicle->bIsBus)
-								SetExitCar(m_pMyVehicle, 0);
-							else {
-								eCarNodes doorNode = CAR_DOOR_LF;
-								if (m_pMyVehicle->pDriver != this) {
-									if (m_pMyVehicle->pPassengers[0] == this) {
-										doorNode = CAR_DOOR_RF;
-									} else if (m_pMyVehicle->pPassengers[1] == this) {
-										doorNode = CAR_DOOR_LR;
-									} else if (m_pMyVehicle->pPassengers[2] == this) {
-										doorNode = CAR_DOOR_RR;
-									}
-								}
-								SetBeingDraggedFromCar(m_pMyVehicle, doorNode, false);
-							}
-						}
-					}
-				}
-				break;
-			}
-			case OBJECTIVE_GOTO_AREA_ANY_MEANS:
-			{
-				distWithTarget = m_nextRoutePointPos - GetPosition();
-				distWithTarget.z = 0.0f;
-				if (InVehicle()) {
-					CCarAI::GetCarToGoToCoors(m_pMyVehicle, &m_nextRoutePointPos);
-					CCarCtrl::RegisterVehicleOfInterest(m_pMyVehicle);
-					if (distWithTarget.MagnitudeSqr() < sq(20.0f)) {
-						m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
-						ForceStoredObjective(OBJECTIVE_GOTO_AREA_ANY_MEANS);
-						SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
-					}
-					break;
-				}
-				if (distWithTarget.Magnitude() > 30.0f) {
-					if (m_pMyVehicle) {
-						m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
-					} else {
-						float closestVehDist = SQR(60.0f);
-						int16 lastVehicle;
-						CEntity* vehicles[8];
-						// NB: 25.0f in here is prolly a forgotten setting, all other places now use 30.0f (ENTER_CAR_MAX_DIST)
-						CWorld::FindObjectsInRange(GetPosition(), 25.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
-						CVehicle* foundVeh = nil;
-						for (int i = 0; i < lastVehicle; i++) {
-							CVehicle* nearVeh = (CVehicle*)vehicles[i];
-							/*
-							Not used.
-							CVector vehSpeed = nearVeh->GetSpeed();
-							CVector ourSpeed = GetSpeed();
-							*/
-							CVector vehDistVec = nearVeh->GetPosition() - GetPosition();
-							if (vehDistVec.MagnitudeSqr() < closestVehDist && m_pedInObjective->m_pMyVehicle != nearVeh) {
-								foundVeh = nearVeh;
-								closestVehDist = vehDistVec.MagnitudeSqr();
-							}
-						}
-						m_pMyVehicle = foundVeh;
-						if (m_pMyVehicle) {
-							m_pMyVehicle->RegisterReference((CEntity **) &m_pMyVehicle);
-							m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
-							SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, m_pMyVehicle);
-						}
-					}
-					break;
-				}
-				// Falls to different objectives in III and VC
-#ifdef FIX_BUGS
-				break;
-#else
-				// fall through
-#endif
-			}
-			case OBJECTIVE_GOTO_SEAT_ON_FOOT:
-			case OBJECTIVE_GOTO_ATM_ON_FOOT:
-			case OBJECTIVE_GOTO_BUS_STOP_ON_FOOT:
-			case OBJECTIVE_GOTO_PIZZA_ON_FOOT:
-			case OBJECTIVE_GOTO_SHELTER_ON_FOOT:
-			case OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT:
-				if (CTimer::GetTimeInMilliseconds() > m_objectiveTimer) {
-					m_objectiveTimer = 0;
-					if (m_attractor)
-						GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-				} else {
-					CVector distance = m_nextRoutePointPos - GetPosition();
-					distance.z = 0.0f;
-					if (m_objective == OBJECTIVE_GOTO_SHELTER_ON_FOOT) {
-						if (m_nMoveState == PEDMOVE_RUN && distance.MagnitudeSqr() < SQR(2.0f)) {
-							SetMoveState(PEDMOVE_WALK);
-							bIsRunning = false;
-						}
-						if (CWeather::Rain < 0.2f && m_attractor) {
-							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-							return;
-						}
-					}
-					else if (m_objective == OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT) {
-						if (m_nMoveState == PEDMOVE_RUN && distance.MagnitudeSqr() < SQR(4.0f)) {
-							SetMoveState(PEDMOVE_WALK);
-							bIsRunning = false;
-						}
-						CVehicle* pIceCreamVan = GetPedAttractorManager()->GetIceCreamVanForEffect(m_attractor->GetEffect());
-						if (0.01f * CTimer::GetTimeStep() * 5.0f < pIceCreamVan->m_fDistanceTravelled) {
-							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-							return;
-						}
-						if (!pIceCreamVan->pDriver ||
-							!pIceCreamVan->pDriver->IsPlayer() ||
-							pIceCreamVan->pDriver->GetPedState() == PED_ARRESTED ||
-							pIceCreamVan->pDriver->GetPedState() == PED_DEAD) {
-							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-							return;
-						}
-						if (!pIceCreamVan->m_bSirenOrAlarm) {
-							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-							return;
-						}
-						if (pIceCreamVan->GetStatus() == STATUS_WRECKED) {
-							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-							return;
-						}
-					}
-					if (sq(m_distanceToCountSeekDone) < distance.MagnitudeSqr()) {
-						if (CTimer::GetTimeInMilliseconds() > m_nPedStateTimer || GetPedState() != PED_SEEK_POS) {
-							m_vecSeekPos = m_nextRoutePointPos;
-							SetSeek(m_vecSeekPos, m_distanceToCountSeekDone);
-						}
-					}
-					else {
-						if (!bReachedAttractorHeadingTarget) {
-							float fHeadingDistance = m_fRotationCur - m_attractorHeading;
-							float fSinHeading = Sin(fHeadingDistance);
-							float fCosHeading = Cos(fHeadingDistance);
-							if (fSinHeading > 0.0f) {
-								if (fCosHeading > 0.0f)
-									m_attractorHeading = m_fRotationCur - Asin(fSinHeading);
-								else
-									m_attractorHeading = m_fRotationCur - Acos(fCosHeading);
-							}
-							else {
-								if (fCosHeading > 0.0f)
-									m_attractorHeading = m_fRotationCur - Asin(fSinHeading);
-								else
-									m_attractorHeading = m_fRotationCur + Acos(fCosHeading);
-							}
-							m_fRotationDest = m_attractorHeading;
-							m_headingRate = 3.5f;
-							bReachedAttractorHeadingTarget = true;
-							bTurnedAroundOnAttractor = false;
-						}
-						if (Abs(m_fRotationCur - m_attractorHeading) >= m_acceptableHeadingOffset &&
-							Abs(m_fRotationCur - m_attractorHeading + TWOPI) >= m_acceptableHeadingOffset &&
-							Abs(m_fRotationCur - m_attractorHeading - TWOPI) >= m_acceptableHeadingOffset)
-							SetMoveState(PEDMOVE_STILL);
-						else {
-							m_fRotationDest = m_fRotationCur;
-							bReachedAttractorHeadingTarget = false;
-							bObjectiveCompleted = true;
-							bScriptObjectiveCompleted = true;
-							RestoreHeadingRate();
-							GetPedAttractorManager()->BroadcastArrival(this, m_attractor);
-							if (GetPedAttractorManager()->IsAtHeadOfQueue(this, m_attractor)) {
-								switch (m_objective) {
-								case OBJECTIVE_GOTO_SEAT_ON_FOOT:
-									if (!bTurnedAroundOnAttractor) {
-										ClearObjective();
-										SetWaitState(WAITSTATE_SIT_DOWN, 0);
-									}
-									else {
-										ClearObjective();
-										SetWaitState(WAITSTATE_SIT_DOWN_RVRS, 0);
-									}
-									break;
-								case OBJECTIVE_GOTO_ATM_ON_FOOT:
-									ClearObjective();
-									SetWaitState(WAITSTATE_USE_ATM, 0);
-									break;
-								case OBJECTIVE_GOTO_BUS_STOP_ON_FOOT:
-									ClearObjective();
-									SetObjective(OBJECTIVE_WAIT_ON_FOOT_AT_BUS_STOP);
-									break;
-								case OBJECTIVE_GOTO_PIZZA_ON_FOOT:
-									ClearObjective();
-									m_prevObjective = OBJECTIVE_NONE;
-									SetObjective(OBJECTIVE_WAIT_ON_FOOT);
-									m_objectiveTimer = CTimer::GetTimeInMilliseconds() + m_attractor->GetHeadOfQueueWaitTime();
-									break;
-								case OBJECTIVE_GOTO_SHELTER_ON_FOOT:
-									m_prevObjective = OBJECTIVE_NONE;
-									SetObjective(OBJECTIVE_WAIT_ON_FOOT_AT_SHELTER);
-									break;
-								case OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT:
-									m_prevObjective = OBJECTIVE_NONE;
-									SetObjective(OBJECTIVE_WAIT_ON_FOOT_AT_ICE_CREAM_VAN);
-									break;
-								}
-							} else {
-								m_prevObjective = OBJECTIVE_NONE;
-								SetObjective(OBJECTIVE_WAIT_ON_FOOT);
-								m_objectiveTimer = 0;
-							}
-						}
-					}
-				}
-				return;
-			case OBJECTIVE_FLEE_CAR:
-				if (!bInVehicle && m_nPedState != PED_FLEE_ENTITY && m_pMyVehicle) {
-					RestorePreviousObjective();
-					SetFlee(m_pMyVehicle, 6000);
-					break;
-				}
-				// fall through
-			case OBJECTIVE_LEAVE_CAR:
-				if (CTimer::GetTimeInMilliseconds() > m_leaveCarTimer) {
-					if (InVehicle() &&
-						(FindPlayerPed() != this || !CPad::GetPad(0)->GetAccelerate() || bBusJacked)) {
-
-						if (m_nPedState != PED_EXIT_CAR && m_nPedState != PED_DRAG_FROM_CAR && m_nPedState != PED_EXIT_TRAIN
-							&& (m_nPedType != PEDTYPE_COP
-								|| m_pMyVehicle->IsBoat()
-								|| m_pMyVehicle->m_vecMoveSpeed.MagnitudeSqr2D() < sq(0.005f))) {
-#ifdef GTA_TRAIN
-							if (m_pMyVehicle->IsTrain())
-								SetExitTrain(m_pMyVehicle);
-							else
-#endif
-							if (m_pMyVehicle->IsBoat())
-								SetExitBoat(m_pMyVehicle);
-							else
-								SetExitCar(m_pMyVehicle, 0);
-						}
-					} else {
-						RestorePreviousObjective();
-					}
-				}
-				if (bHeldHostageInCar) {
-					if (CTheScripts::IsPlayerOnAMission()) {
-						CVehicle *playerVeh = FindPlayerVehicle();
-						if (playerVeh && playerVeh->IsPassenger(this)) {
-							if (m_leaveCarTimer != 0)
-								m_leaveCarTimer = 0;
-						}
-					}
-				}
-				break;
-			case OBJECTIVE_AIM_GUN_AT:
-				if (m_pedInObjective) {
-					if (!bObstacleShowedUpDuringKillObjective)
-						SetPointGunAt(m_pedInObjective);
+			particleDir.z = CGeneral::GetRandomNumberInRange(0.01f, 0.03f);
+			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);
+		}
 
-					if (m_nMoveState == PEDMOVE_STILL && IsPedInControl()) {
-						SetLookFlag(m_pedInObjective, false);
-						TurnBody();
-					}
-				} else {
-					ClearObjective();
-				}
-				break;
-			case OBJECTIVE_WAIT_ON_FOOT_AT_SHELTER:
-				SetIdle();
-				if (m_attractor && CWeather::Rain < 0.2f)
-					GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-				break;
-			case OBJECTIVE_KILL_CHAR_ON_BOAT:
-				SetPedStats(PEDSTAT_TOUGH_GUY);
-				if (bInVehicle) {
-					if (m_pedInObjective && m_pedInObjective->m_pCurrentPhysSurface != m_pMyVehicle) {
-						bObjectiveCompleted = true;
-						ClearObjective();
-						CCarCtrl::SwitchVehicleToRealPhysics(m_pMyVehicle);
-						m_pMyVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
-						m_pMyVehicle->AutoPilot.m_nCruiseSpeed = GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fUnkMaxVelocity;
-						m_pMyVehicle->SetStatus(STATUS_PHYSICS);
-					} else {
-						SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
-					}
-				} else if (m_pedInObjective && !m_pedInObjective->DyingOrDead() &&
-					(!m_pCurrentPhysSurface || !m_pedInObjective->m_pCurrentPhysSurface ||
-						m_pedInObjective->m_pCurrentPhysSurface == m_pCurrentPhysSurface)) {
-
-					CBoat *boatWeAreOn = nil;
-					if (m_pCurrentPhysSurface && m_pCurrentPhysSurface->IsVehicle() && ((CVehicle*)m_pCurrentPhysSurface)->IsBoat())
-						boatWeAreOn = (CBoat*)m_pCurrentPhysSurface;
-
-					if (boatWeAreOn) {
-						SetObjective(OBJECTIVE_RUN_TO_AREA, boatWeAreOn->GetPosition() - (boatWeAreOn->GetForward() * 10.f));
-					} else if (m_pedInObjective) {
-						SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS, m_pedInObjective);
-					}
-					SetMoveAnim();
-				} else {
-					ClearLookFlag();
-					SetMoveAnim();
-					if (m_pCurrentPhysSurface && m_pCurrentPhysSurface->IsVehicle())
-						SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, m_pCurrentPhysSurface);
-				}
-				break;
-			case OBJECTIVE_SOLICIT_FOOT:
-				if (m_pedInObjective) {
-					if (m_objectiveTimer < CTimer::GetTimeInMilliseconds())
-						bScriptObjectiveCompleted = true;
-				} else {
-					bScriptObjectiveCompleted = true;
-				}
-				break;
-			case OBJECTIVE_WAIT_ON_FOOT_AT_BUS_STOP:
-				SetIdle();
-				if (m_attractor) {
-					float left = GetPosition().x - 10.0f;
-					float right = GetPosition().x + 10.0f;
-					float top = GetPosition().y - 10.0f;
-					float bottom = GetPosition().y + 10.0f;
-					int xstart = Max(0, CWorld::GetSectorIndexX(left));
-					int xend = Min(NUMSECTORS_X - 1, CWorld::GetSectorIndexX(right));
-					int ystart = Max(0, CWorld::GetSectorIndexY(top));
-					int yend = Min(NUMSECTORS_Y - 1, CWorld::GetSectorIndexY(bottom));
-					assert(xstart <= xend);
-					assert(ystart <= yend);
-
-					float minDistance = SQR(10.0f);
-					CVehicle* pBus = nil;
-
-					for (int y = ystart; y <= yend; y++) {
-						for (int x = xstart; x <= xend; x++) {
-							CSector* s = CWorld::GetSector(x, y);
-							for (CPtrNode* pNode = s->m_lists[ENTITYLIST_VEHICLES].first; pNode != nil; pNode = pNode->next) {
-								CEntity* pEntity = (CEntity*)pNode->item;
-								if (!pEntity->IsVehicle())
-									continue;
-								CVehicle* pVehicle = (CVehicle*)pEntity;
-								if (!pVehicle->bIsBus)
-									continue;
-								if (pVehicle->GetMoveSpeed().MagnitudeSqr() >= SQR(0.005f))
-									continue;
-								float distanceSq = (GetPosition() - pVehicle->GetPosition()).MagnitudeSqr();
-								if (distanceSq < minDistance) {
-									minDistance = distanceSq;
-									pBus = pVehicle;
-								}
-							}
-						}
-					}
+		if (m_nPedState == PED_JUMP) {
+			CVector particlePos = GetPosition();
+			particlePos.z -= 0.1f;
 
-					if (pBus) {
-						if (pBus->m_nNumPassengers >= pBus->m_nNumMaxPassengers - 1)
-							SetObjective(OBJECTIVE_WAIT_ON_FOOT);
-						else {
-							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-							SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, pBus);
-							bDontDragMeOutCar = true;
-							bRemoveMeWhenIGotIntoCar = true;
-							CPlayerPed *player = FindPlayerPed();
-							if (pBus->IsPassenger(player) || pBus->IsDriver(player)) {
-								bCollectBusFare = true;
-							}
-						}
-					}
-				}
-				break;
-			case OBJECTIVE_WAIT_ON_FOOT_AT_ICE_CREAM_VAN:
-			{
-				SetIdle();
-				CVehicle* pIceCreamVan = GetPedAttractorManager()->GetIceCreamVanForEffect(m_attractor->GetEffect());
-				if (m_attractor && m_nWaitState != WAITSTATE_PLAYANIM_CHAT && pIceCreamVan && pIceCreamVan->pDriver && pIceCreamVan->pDriver->IsPlayer()) {
-					int time = 5000;
-					SetWaitState(WAITSTATE_PLAYANIM_CHAT, &time);
-					break;
-				}
-				if (!m_attractor)
-					break;
-				CVehicle* pVan = GetPedAttractorManager()->GetIceCreamVanForEffect(m_attractor->GetEffect());
-				if (!pVan)
-					break;
-				if (0.01f * CTimer::GetTimeStep() * 5.0f < pVan->m_fDistanceTravelled) {
-					GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-					break;
-				}
-				if (!pVan->pDriver || !pVan->pDriver->IsPlayer() || pVan->pDriver->GetPedState() == PED_ARRESTED || pVan->pDriver->GetPedState() == PED_DEAD) {
-					GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-					break;
-				}
-				if (!pVan->m_bSirenOrAlarm) {
-					GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-					return; // Why?
-				}
-				if (pVan->GetStatus() == STATUS_WRECKED) {
-					GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-					return; // Why?
-				}
-				break;
-			}
-		}
-		if (bObjectiveCompleted
-			|| m_objectiveTimer > 0 && CTimer::GetTimeInMilliseconds() > m_objectiveTimer) {
-			RestorePreviousObjective();
-			if (m_objectiveTimer > CTimer::GetTimeInMilliseconds() || !m_objectiveTimer)
-				m_objectiveTimer = CTimer::GetTimeInMilliseconds() - 1;
-
-			if (CharCreatedBy != RANDOM_CHAR || bInVehicle) {
-				if (IsPedInControl())
-					RestorePreviousState();
-			} else {
-				SetWanderPath(CGeneral::GetRandomNumber() & 7);
-			}
-			ClearAimFlag();
-			ClearLookFlag();
+			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);
 		}
 	}
 }
 
 // --MIAMI: Done
-void
-CPed::SetShootTimer(uint32 time)
-{
-	if (CTimer::GetTimeInMilliseconds() > m_shootTimer) {
-		m_shootTimer = CTimer::GetTimeInMilliseconds() + time;
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::SetSeekCar(CVehicle *car, uint32 doorNode)
-{
-	if (m_nPedState == PED_SEEK_CAR)
-		return;
-
-	if (!CanSetPedState() || m_nPedState == PED_DRIVING)
-		return;
-
-	SetStoredState();
-	m_pSeekTarget = car;
-	m_pSeekTarget->RegisterReference((CEntity**) &m_pSeekTarget);
-	m_carInObjective = car;
-	m_carInObjective->RegisterReference((CEntity**) &m_carInObjective);
-	m_pMyVehicle = car;
-	m_pMyVehicle->RegisterReference((CEntity**) &m_pMyVehicle);
-	// m_pSeekTarget->RegisterReference((CEntity**) &m_pSeekTarget);
-	m_vehEnterType = doorNode;
-	m_distanceToCountSeekDone = 0.5f;
-	SetPedState(PED_SEEK_CAR);
-
-}
-
-// --MIAMI: Done
-void
-CPed::SetSeekBoatPosition(CVehicle *boat)
+// Actually GetLocalDirectionTo(Turn/Look)
+int
+CPed::GetLocalDirection(const CVector2D &posOffset)
 {
-	if (m_nPedState == PED_SEEK_IN_BOAT || boat->pDriver || !IsPedInControl())
-		return;
+	int direction;
+	float angle;
 
-	SetStoredState();
-	m_carInObjective = boat;
-	m_carInObjective->RegisterReference((CEntity **) &m_carInObjective);
-	m_pMyVehicle = boat;
-	m_pMyVehicle->RegisterReference((CEntity **) &m_pMyVehicle);
-	m_distanceToCountSeekDone = 0.5f;
-	SetPedState(PED_SEEK_IN_BOAT);
-}
+	for (angle = posOffset.Heading() - m_fRotationCur + DEGTORAD(45.0f); angle < 0.0f; angle += TWOPI);
 
-#ifdef GTA_TRAIN
-void
-CPed::SetExitTrain(CVehicle* train)
-{
-	if (m_nPedState == PED_EXIT_TRAIN || train->GetStatus() != STATUS_TRAIN_NOT_MOVING || !((CTrain*)train)->Doors[0].IsFullyOpen())
-		return;
+	for (direction = RADTODEG(angle)/90.0f; direction > 3; direction -= 4);
 
-	/*
-	// Not used
-	CVector exitPos;
-	GetNearestTrainPedPosition(train, exitPos);
-	*/
-	m_nPedState = PED_EXIT_TRAIN;
-	m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_TRAIN_GETOUT, 4.0f);
-	m_pVehicleAnim->SetFinishCallback(PedSetOutTrainCB, this);
-	bUsesCollision = false;
-	LineUpPedWithTrain();
+	// 0-forward, 1-left, 2-backward, 3-right.
+	return direction;
 }
-#endif
 
 // --MIAMI: Done
 bool
@@ -16158,466 +3920,939 @@ CPed::SetDirectionToWalkAroundObject(CEntity *obj)
 }
 
 // --MIAMI: Done
-int32
-CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
+bool
+CPed::IsPedInControl(void)
 {
-	bool collidedWithBoat = false;
-	bool belowTorsoCollided = false;
-	float gravityEffect = -0.15f * CTimer::GetTimeStep();
-	CColPoint intersectionPoint;
-	CColLine ourLine;
+	return m_nPedState <= PED_STATES_NO_AI
+		&& !bIsInTheAir && !bIsLanding
+		&& m_fHealth > 0.0f;
+}
 
-	CColModel *ourCol = CModelInfo::GetModelInfo(GetModelIndex())->GetColModel();
-	CColModel *hisCol = CModelInfo::GetModelInfo(collidingEnt->GetModelIndex())->GetColModel();
+// --MIAMI: Done
+bool
+CPed::IsPedShootable(void)
+{
+	return m_nPedState <= PED_STATES_NO_ST;
+}
 
-	if (!bUsesCollision && !bJustCheckCollision)
+// --MIAMI: Done
+bool
+CPed::UseGroundColModel(void)
+{
+	return m_nPedState == PED_FALL ||
+		m_nPedState == PED_DIVE_AWAY ||
+		m_nPedState == PED_DIE ||
+		m_nPedState == PED_DEAD;
+}
+
+// --MIAMI: Done
+bool
+CPed::CanPedReturnToState(void)
+{
+	return m_nPedState <= PED_STATES_NO_AI && m_nPedState != PED_AIM_GUN && m_nPedState != PED_ATTACK &&
+		m_nPedState != PED_FIGHT && m_nPedState != PED_STEP_AWAY && m_nPedState != PED_SNIPER_MODE && m_nPedState != PED_LOOK_ENTITY;
+}
+
+// --MIAMI: Done
+bool
+CPed::CanSetPedState(void)
+{
+	return !DyingOrDead() && m_nPedState != PED_ARRESTED && !EnteringCar() && m_nPedState != PED_STEAL_CAR;
+}
+
+// --MIAMI: Done
+bool
+CPed::CanStrafeOrMouseControl(void)
+{
+#ifdef FREE_CAM
+	if (CCamera::bFreeCam)
 		return false;
+#endif
+	return m_nPedState == PED_NONE || m_nPedState == PED_IDLE || m_nPedState == PED_FLEE_POS || m_nPedState == PED_FLEE_ENTITY ||
+		m_nPedState == PED_ATTACK || m_nPedState == PED_FIGHT || m_nPedState == PED_AIM_GUN || m_nPedState == PED_JUMP || m_nPedState == PED_ANSWER_MOBILE;
+}
 
-	if (collidingEnt->IsVehicle() && ((CVehicle*)collidingEnt)->IsBoat())
-		collidedWithBoat = true;
+// --MIAMI: Done
+void
+CPed::PedSetPreviousStateCB(CAnimBlendAssociation* assoc, void* arg)
+{
+	CPed* ped = (CPed*)arg;
+	ped->RestorePreviousState();
+	ped->m_pVehicleAnim = nil;
+}
 
-	// ofc we're not vehicle
-	if (!m_bIsVehicleBeingShifted && !bSkipLineCol && !collidingEnt->IsPed()) {
-		if (!bCollisionProcessed) {
-			m_pCurrentPhysSurface = nil;
-			if (bIsStanding) {
-				bIsStanding = false;
-				bWasStanding = true;
+// --MIAMI: Done
+void
+CPed::PedGetupCB(CAnimBlendAssociation* animAssoc, void* arg)
+{
+	CPed* ped = (CPed*)arg;
+
+	if (ped->m_nPedState == PED_GETUP)
+		RpAnimBlendClumpSetBlendDeltas(ped->GetClump(), ASSOC_PARTIAL, -1000.0f);
+
+	ped->bFallenDown = false;
+	animAssoc->blendDelta = -1000.0f;
+	if (ped->m_nPedState == PED_GETUP)
+		ped->RestorePreviousState();
+
+	if (ped->bFleeWhenStanding && ped->m_threatEx) {
+		ped->SetFlee(ped->m_threatEx, 10000);
+		ped->Say(SOUND_PED_FLEE_SPRINT);
+		ped->bFleeWhenStanding = false;
+		ped->m_threatEx = nil;
+
+	} else if (ped->bGotUpOfMyOwnAccord) {
+		ped->SetObjective(OBJECTIVE_NONE);
+		ped->SetWanderPath(CGeneral::GetRandomNumberInRange(0.f, 8.f));
+		ped->bGotUpOfMyOwnAccord = false;
+
+	} else {
+		if (ped->m_nPedState != PED_FLEE_POS && ped->m_nPedState != PED_FLEE_ENTITY)
+			ped->SetMoveState(PEDMOVE_STILL);
+		else
+			ped->SetMoveState(PEDMOVE_RUN);
+		ped->SetMoveAnim();
+	}
+
+	ped->bGetUpAnimStarted = false;
+}
+
+// --MIAMI: Done
+void
+CPed::PedLandCB(CAnimBlendAssociation* animAssoc, void* arg)
+{
+	CPed* ped = (CPed*)arg;
+
+	animAssoc->blendDelta = -1000.0f;
+	ped->bIsLanding = false;
+
+	if (ped->m_nPedState == PED_JUMP)
+		ped->RestorePreviousState();
+}
+
+// --MIAMI: Done
+void
+CPed::PedStaggerCB(CAnimBlendAssociation* animAssoc, void* arg)
+{
+	/*
+	CPed *ped = (CPed*)arg;
+
+	if (ped->m_nPedState == PED_STAGGER)
+		// nothing
+	*/
+}
+// --MIAMI: Done
+void
+CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg)
+{
+	CPed *ped = (CPed*)arg;
+
+	CVehicle *veh = ped->m_pMyVehicle;
+
+	bool startedToRun = false;
+	ped->bUsesCollision = true;
+	ped->m_actionX = 0.0f;
+	ped->m_actionY = 0.0f;
+	ped->bVehExitWillBeInstant = false;
+	if (veh && veh->IsBoat())
+		ped->ApplyMoveSpeed();
+
+	if (ped->m_objective == OBJECTIVE_LEAVE_CAR)
+		ped->RestorePreviousObjective();
+	else if (ped->m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE) {
+		ped->m_fHealth = 0.0f;
+		ped->SetDie(ANIM_FLOOR_HIT, 4.0f, 0.5f);
+	}
+
+	ped->bInVehicle = false;
+	if (veh && (veh->IsCar() || veh->IsBike())) {
+		CWorld::pIgnoreEntity = veh;
+		if (CWorld::TestSphereAgainstWorld(ped->GetPosition() - CVector(0.f, 0.f, 0.2f),
+				0.4f, veh, true, true, false, false, false, false)
+			|| CWorld::TestSphereAgainstWorld(ped->GetPosition() + CVector(0.f, 0.f, 0.2f),
+				0.4f, veh, true, true, false, false, false, false)
+			|| !CWorld::GetIsLineOfSightClear(veh->GetPosition(), ped->GetPosition(), true, false, false, true, false, false, false)) {
+			CWorld::pIgnoreEntity = nil;
+			ped->PositionPedOutOfCollision();
+		}
+		CWorld::pIgnoreEntity = nil;
+	}
+
+	if (ped->m_nPedState == PED_EXIT_CAR) {
+		if (ped->m_nPedType == PEDTYPE_COP) {
+			ped->SetIdle();
+			if (((CCopPed*)ped)->m_nCopType == COP_MIAMIVICE && ped->m_pMyVehicle && ped->m_pMyVehicle->pDriver == ped) {
+				DMAudio.PlayOneShot(ped->m_audioEntityId, SOUND_PED_MIAMIVICE_EXITING_CAR, 0.f);
 			}
-			bCollisionProcessed = true;
-			m_fCollisionSpeed += m_vecMoveSpeed.Magnitude2D() * CTimer::GetTimeStep();
-			bStillOnValidPoly = false;
-			if (IsPlayer() || m_fCollisionSpeed >= 1.0f
-				&& (m_fCollisionSpeed >= 2.0f || m_nPedState != PED_WANDER_PATH)) {
-				m_collPoly.valid = false;
-				m_fCollisionSpeed = 0.0f;
-				bHitSteepSlope = false;
+		} else
+			ped->RestorePreviousState();
+
+		veh = ped->m_pMyVehicle;
+		if (ped->bFleeAfterExitingCar && veh) {
+			ped->bFleeAfterExitingCar = false;
+			ped->SetFlee(veh->GetPosition(), 12000);
+			ped->bUsePedNodeSeek = true;
+			ped->m_pNextPathNode = nil;
+			if (CGeneral::GetRandomNumber() & 1 || ped->m_pedStats->m_fear > 70) {
+				ped->SetMoveState(PEDMOVE_SPRINT);
+				ped->Say(SOUND_PED_FLEE_SPRINT);
 			} else {
-				CVector pos = GetPosition();
-				float potentialGroundZ = GetPosition().z - FEET_OFFSET;
-				if (bWasStanding) {
-					pos.z += -0.25f;
-					potentialGroundZ += gravityEffect;
-				}
-				if (CCollision::IsStoredPolyStillValidVerticalLine(pos, potentialGroundZ, intersectionPoint, &m_collPoly)) {
-					bStillOnValidPoly = true;
-					if(!bHeadStuckInCollision || FEET_OFFSET + intersectionPoint.point.z < GetPosition().z) {
-						GetMatrix().GetPosition().z = FEET_OFFSET + intersectionPoint.point.z;
-						if (bHeadStuckInCollision)
-							bHeadStuckInCollision = false;
-					}
-					m_vecMoveSpeed.z = 0.0f;
-					bIsStanding = true;
-				} else {
-					m_collPoly.valid = false;
-					m_fCollisionSpeed = 0.0f;
-					bHitSteepSlope = false;
+				ped->SetMoveState(PEDMOVE_RUN);
+				ped->Say(SOUND_PED_FLEE_RUN);
+			}
+			startedToRun = true;
+
+			// This is not a good way to do this...
+			ped->m_nLastPedState = PED_WANDER_PATH;
+
+		} else if (ped->bWanderPathAfterExitingCar) {
+			ped->SetWanderPath(CGeneral::GetRandomNumberInRange(0.0f, 8.0f));
+			ped->bWanderPathAfterExitingCar = false;
+			if (ped->m_nPedType == PEDTYPE_PROSTITUTE)
+				ped->SetObjectiveTimer(30000);
+			ped->m_nLastPedState = PED_NONE;
+
+		} else if (ped->bGonnaKillTheCarJacker) {
+
+			// Kill objective is already given at this point.
+			ped->bGonnaKillTheCarJacker = false;
+			if (ped->m_pedInObjective) {
+				if (!(CGeneral::GetRandomNumber() & 1)
+					&& ped->m_nPedType != PEDTYPE_COP
+					&& (!ped->m_pedInObjective->IsPlayer() || !CTheScripts::IsPlayerOnAMission())) {
+					ped->ClearObjective();
+					ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, veh);
 				}
+				ped->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 1500;
 			}
+			int waitTime = 1500;
+			ped->SetWaitState(WAITSTATE_PLAYANIM_COWER, &waitTime);
+			ped->SetMoveState(PEDMOVE_RUN);
+			startedToRun = true;
+		} else if (ped->m_objective == OBJECTIVE_NONE && ped->CharCreatedBy != MISSION_CHAR && ped->m_nPedState == PED_IDLE && !ped->IsPlayer()) {
+			ped->SetWanderPath(CGeneral::GetRandomNumberInRange(0.0f, 8.0f));
 		}
+	}
+#ifdef VC_PED_PORTS
+	else if (ped->m_nPedState == PED_DRIVING) {
+		ped->m_nPedState = PED_IDLE;
+	}
+#endif
 
-		if (!bStillOnValidPoly) {
-			CVector potentialCenter = GetPosition();
-			potentialCenter.z = GetPosition().z - 0.52f;
+	if (animAssoc)
+		animAssoc->blendDelta = -1000.0f;
 
-			// 0.52f should be a ped's approx. radius
-			float totalRadiusWhenCollided = collidingEnt->GetBoundRadius() + 0.52f - gravityEffect;
-			if (bWasStanding) {
-				if (collidedWithBoat) {
-					potentialCenter.z += 2.0f * gravityEffect;
-					totalRadiusWhenCollided += Abs(gravityEffect);
-				} else {
-					potentialCenter.z += gravityEffect;
+	ped->RestartNonPartialAnims();
+	ped->m_pVehicleAnim = nil;
+	ped->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
+	veh = ped->m_pMyVehicle;
+	if (veh) {
+		if (ped->m_nPedType == PEDTYPE_PROSTITUTE) {
+			if (veh->pDriver) {
+				if (veh->pDriver->IsPlayer() && ped->CharCreatedBy == RANDOM_CHAR) {
+					CWorld::Players[CWorld::PlayerInFocus].m_nNextSexMoneyUpdateTime = 0;
+					CWorld::Players[CWorld::PlayerInFocus].m_nNextSexFrequencyUpdateTime = 0;
+					CWorld::Players[CWorld::PlayerInFocus].m_pHooker = nil;
+					CWorld::Players[CWorld::PlayerInFocus].m_nMoney -= 100;
+					if (CWorld::Players[CWorld::PlayerInFocus].m_nMoney < 0)
+						CWorld::Players[CWorld::PlayerInFocus].m_nMoney = 0;
 				}
 			}
-			if (sq(totalRadiusWhenCollided) > (potentialCenter - collidingEnt->GetBoundCentre()).MagnitudeSqr()) {
-				ourLine.p0 = GetPosition();
-				ourLine.p1 = GetPosition();
-				ourLine.p1.z = GetPosition().z - FEET_OFFSET;
-				if (bWasStanding) {
-					ourLine.p1.z = ourLine.p1.z + gravityEffect;
-					ourLine.p0.z = ourLine.p0.z + -0.25f;
-				}
-				float minDist = 1.0f;
-				belowTorsoCollided = CCollision::ProcessVerticalLine(ourLine, collidingEnt->GetMatrix(), *hisCol,
-					intersectionPoint, minDist, false, false, &m_collPoly);
+		}
+		if (veh && veh->IsBike())
+			// BUG? 
+			veh->m_nGettingOutFlags &= ~GetBikeDoorFlag(ped->m_vehEnterType);
+		else
+			veh->m_nGettingOutFlags &= ~GetCarDoorFlag(ped->m_vehEnterType);
 
-				if (collidedWithBoat && bWasStanding && !belowTorsoCollided) {
-					ourLine.p0.z = ourLine.p1.z;
-					ourLine.p1.z = ourLine.p1.z + gravityEffect;
-					belowTorsoCollided = CCollision::ProcessVerticalLine(ourLine, collidingEnt->GetMatrix(), *hisCol,
-						intersectionPoint, minDist, false, false, &m_collPoly);
+		if (veh->pDriver == ped) {
+			veh->RemoveDriver();
+			veh->SetStatus(STATUS_ABANDONED);
+			if (veh->m_nDoorLock == CARLOCK_LOCKED_INITIALLY)
+				veh->m_nDoorLock = CARLOCK_UNLOCKED;
+			if (ped->m_nPedType == PEDTYPE_COP && veh->IsLawEnforcementVehicle())
+				veh->ChangeLawEnforcerState(false);
+			if (veh->IsBike()) {
+				if (Abs(veh->m_vecMoveSpeed.x) < 0.1 && Abs(veh->m_vecMoveSpeed.y) < 0.1f) {
+					((CBike*)veh)->bIsStanding = true;
 				}
-				if (belowTorsoCollided) {
-						if (!bIsStanding
-							|| FEET_OFFSET + intersectionPoint.point.z > GetPosition().z
-							|| collidedWithBoat && 3.12f + intersectionPoint.point.z > GetPosition().z) {
+			}
+		} else {
+			veh->RemovePassenger(ped);
+		}
 
-							if (!collidingEnt->IsVehicle() && !collidingEnt->IsObject()) {
-								m_pCurSurface = collidingEnt;
-								collidingEnt->RegisterReference((CEntity**)&m_pCurSurface);
-								bTryingToReachDryLand = false;
-								bOnBoat = false;
-							} else {
-								m_pCurrentPhysSurface = (CPhysical*)collidingEnt;
-								collidingEnt->RegisterReference((CEntity**)&m_pCurrentPhysSurface);
-								m_vecOffsetFromPhysSurface = intersectionPoint.point - collidingEnt->GetPosition();
-								m_pCurSurface = collidingEnt;
-								collidingEnt->RegisterReference((CEntity**)&m_pCurSurface);
-								m_collPoly.valid = false;
-								if (collidingEnt->IsVehicle() && ((CVehicle*)collidingEnt)->IsBoat()) {
-									bOnBoat = true;
-								} else {
-									bOnBoat = false;
-								}
-							}
+		if (veh->bIsBus && !veh->IsUpsideDown() && !veh->IsOnItsSide()) {
+			float angleAfterExit;
+			if (ped->m_vehEnterType == CAR_DOOR_LF) {
+				angleAfterExit = HALFPI + veh->GetForward().Heading();
+			} else {
+				angleAfterExit = veh->GetForward().Heading() - HALFPI;
+			}
+			ped->SetHeading(angleAfterExit);
+			ped->m_fRotationDest = angleAfterExit;
+			ped->m_fRotationCur = angleAfterExit;
+			if (!ped->bBusJacked)
+				ped->SetMoveState(PEDMOVE_WALK);
+		}
+		if (CGarages::IsPointWithinAnyGarage(ped->GetPosition()))
+			veh->bLightsOn = false;
+	}
 
-							if (!bHeadStuckInCollision || FEET_OFFSET + intersectionPoint.point.z < GetPosition().z) {
-								GetMatrix().GetPosition().z = FEET_OFFSET + intersectionPoint.point.z;
-								if (bHeadStuckInCollision)
-									bHeadStuckInCollision = false;
-							}
-							m_nSurfaceTouched = intersectionPoint.surfaceB;
-							if (m_nSurfaceTouched == SURFACE_STEEP_CLIFF) {
-								bHitSteepSlope = true;
-								m_vecDamageNormal = intersectionPoint.normal;
-							}
-						}
+	if (ped->IsPlayer())
+		AudioManager.PlayerJustLeftCar();
 
-						float upperSpeedLimit = 0.33f;
-						float lowerSpeedLimit = -0.25f;
-						float speed = m_vecMoveSpeed.Magnitude2D();
-						if (m_nPedState == PED_IDLE) {
-							upperSpeedLimit *= 2.0f;
-							lowerSpeedLimit *= 1.5f;
-						}
-						CAnimBlendAssociation *fallAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FALL);
-						if (!bWasStanding && speed > upperSpeedLimit && (!bPushedAlongByCar || m_vecMoveSpeed.z < lowerSpeedLimit)
-							&& m_pCollidingEntity != collidingEnt) {
+	ped->ReplaceWeaponWhenExitingVehicle();
 
-							float damage = 100.0f * Max(speed - 0.25f, 0.0f);
-							float damage2 = damage;
-							if (m_vecMoveSpeed.z < -0.25f)
-								damage += (-0.25f - m_vecMoveSpeed.z) * 150.0f;
+	ped->bOnBoat = false;
+	if (ped->bBusJacked) {
+		ped->SetFall(1500, ANIM_KO_SKID_BACK, false);
+		ped->bBusJacked = false;
+	}
+	ped->m_nStoredMoveState = PEDMOVE_NONE;
+	if (!ped->IsPlayer()) {
+		// It's a shame...
+#ifdef FIX_BUGS
+		int createdBy = ped->CharCreatedBy;
+#else
+		int createdBy = !ped->CharCreatedBy;
+#endif
 
-							uint8 dir = 2; // from backward
-							if (m_vecMoveSpeed.x > 0.01f || m_vecMoveSpeed.x < -0.01f || m_vecMoveSpeed.y > 0.01f || m_vecMoveSpeed.y < -0.01f) {
-								CVector2D offset = -m_vecMoveSpeed;
-								dir = GetLocalDirection(offset);
-							}
-							if (CSurfaceTable::IsSoftLanding(intersectionPoint.surfaceB))
-								damage *= 0.5f;
+		if (createdBy == MISSION_CHAR && !startedToRun)
+			ped->SetMoveState(PEDMOVE_WALK);
+	}
+	ped->bHeldHostageInCar = false;
+}
 
-							InflictDamage(collidingEnt, WEAPONTYPE_FALL, damage, PEDPIECE_TORSO, dir);
-							if (IsPlayer() && damage2 > 5.0f)
-								Say(SOUND_PED_LAND);
+// --MIAMI: Done
+void
+CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg)
+{
+	CAnimBlendAssociation *quickJackedAssoc;
+	CVehicle *vehicle; 
+	CPed *ped = (CPed*)arg;
 
-						} else if (!bWasStanding && fallAnim && -0.016f * CTimer::GetTimeStep() > m_vecMoveSpeed.z) {
-							InflictDamage(collidingEnt, WEAPONTYPE_FALL, 15.0f, PEDPIECE_TORSO, 2);
-						}
-						m_vecMoveSpeed.z = 0.0f;
-						bIsStanding = true;
-				} else {
-					bOnBoat = false;
-				}
-			}
+	uint8 exitFlags = 0;
+	quickJackedAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), ANIM_CAR_QJACKED);
+	if (dragAssoc && dragAssoc->animId == ANIM_BIKE_HIT && ped->m_pMyVehicle) {
+		if (ped->m_vehEnterType == CAR_DOOR_LF || ped->m_vehEnterType == CAR_DOOR_RF) {
+			CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_BIKE_FALL_OFF, 100.0f);
+			ped->m_pMyVehicle->m_nGettingOutFlags &= ~(CAR_DOOR_FLAG_RF | CAR_DOOR_FLAG_LF);
+		} else {
+			CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_BIKE_FALL_R, 100.0f);
+			ped->m_pMyVehicle->m_nGettingOutFlags &= ~(CAR_DOOR_FLAG_RR | CAR_DOOR_FLAG_LR);
 		}
+		((CBike*)ped->m_pMyVehicle)->KnockOffRider(WEAPONTYPE_UNIDENTIFIED, 0, ped, true);
+		return;
 	}
 
-	int ourCollidedSpheres = CCollision::ProcessColModels(GetMatrix(), *ourCol, collidingEnt->GetMatrix(), *hisCol, collidingPoints, nil, nil);
-	if (ourCollidedSpheres > 0 || belowTorsoCollided) {
-		AddCollisionRecord(collidingEnt);
-		if (!collidingEnt->IsBuilding())
-			((CPhysical*)collidingEnt)->AddCollisionRecord(this);
+	if (ped->m_nPedState != PED_ARRESTED) {
+		ped->m_nLastPedState = PED_NONE;
+		if (dragAssoc)
+			dragAssoc->blendDelta = -1000.0f;
+	}
+	ped->RestartNonPartialAnims();
+	ped->m_pVehicleAnim = nil;
+	ped->m_pSeekTarget = nil;
+	vehicle = ped->m_pMyVehicle;
 
-		if (ourCollidedSpheres > 0 && (collidingEnt->IsBuilding() || collidingEnt->GetIsStatic())) {
-			bHasHitWall = true;
+	if (vehicle && vehicle->IsBike())
+		exitFlags = GetBikeDoorFlagInclJumpInFromFront(ped->m_vehEnterType);
+	else
+		exitFlags = GetCarDoorFlag(ped->m_vehEnterType);
+
+	if (vehicle)
+		vehicle->m_nGettingOutFlags &= ~exitFlags;
+
+	if (vehicle) {
+		if (vehicle->pDriver == ped) {
+			vehicle->RemoveDriver();
+			if (vehicle->m_nDoorLock == CARLOCK_LOCKED_INITIALLY)
+				vehicle->m_nDoorLock = CARLOCK_UNLOCKED;
+
+			if (ped->m_nPedType == PEDTYPE_COP && vehicle->IsLawEnforcementVehicle())
+				vehicle->ChangeLawEnforcerState(false);
+		} else {
+			vehicle->RemovePassenger(ped);
 		}
 	}
-	if (collidingEnt->IsBuilding() || collidingEnt->GetIsStatic()) {
-		if (bWasStanding) {
-			CVector sphereNormal;
-			float normalLength;
-			for(int sphere = 0; sphere < ourCollidedSpheres; sphere++) {
-				sphereNormal = collidingPoints[sphere].normal;
-				if (sphereNormal.z >= -1.0f || !IsPlayer()) {
-					normalLength = sphereNormal.Magnitude2D();
-					if (normalLength != 0.0f) {
-						sphereNormal.x = sphereNormal.x / normalLength;
-						sphereNormal.y = sphereNormal.y / normalLength;
-					}
-				} else {
-					float speed = m_vecMoveSpeed.Magnitude2D();
-					sphereNormal.x = -m_vecMoveSpeed.x / Max(0.001f, speed);
-					sphereNormal.y = -m_vecMoveSpeed.y / Max(0.001f, speed);
-					GetMatrix().GetPosition().z -= 0.05f;
-					bHeadStuckInCollision = true;
-				}
-				sphereNormal.Normalise();
-				collidingPoints[sphere].normal = sphereNormal;
-				if (collidingPoints[sphere].surfaceB == SURFACE_STEEP_CLIFF)
-					bHitSteepSlope = true;
-			}
-		}
+	ped->bInVehicle = false;
+	if (ped->IsPlayer())
+		AudioManager.PlayerJustLeftCar();
+
+	if (ped->m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE) {
+		dragAssoc->SetDeleteCallback(PedSetDraggedOutCarPositionCB, ped);
+		ped->m_fHealth = 0.0f;
+		ped->SetDie(ANIM_FLOOR_HIT, 1000.0f, 0.5f);
+		return;
 	}
-	return ourCollidedSpheres;
+
+	if (quickJackedAssoc) {
+		dragAssoc->SetDeleteCallback(PedSetQuickDraggedOutCarPositionCB, ped);
+	} else {
+		dragAssoc->SetDeleteCallback(PedSetDraggedOutCarPositionCB, ped);
+		if (ped->CanSetPedState())
+			CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
+	}
+
+	ped->ReplaceWeaponWhenExitingVehicle();
+
+	ped->m_nStoredMoveState = PEDMOVE_NONE;
+	ped->bVehExitWillBeInstant = false;
 }
 
 // --MIAMI: Done
 void
-CPed::SetFormation(eFormation type)
+CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
-	// FIX: Formations in GetFormationPosition were in range 1-8, whereas in here it's 0-7.
-	//      To not change the behaviour, range in here tweaked by 1 with the use of enum.
-
-	switch (m_pedFormation) {
-		case FORMATION_REAR:
-		case FORMATION_REAR_LEFT:
-		case FORMATION_REAR_RIGHT:
-		case FORMATION_FRONT_LEFT:
-		case FORMATION_FRONT_RIGHT:
-		case FORMATION_LEFT:
-		case FORMATION_RIGHT:
-		case FORMATION_FRONT:
+	CPed *ped = (CPed*)arg;
+
+	CVehicle *veh = ped->m_pMyVehicle;
+
+	// Pointless code
+	if (!veh)
+		return;
+
+	// Situation of entering car as a driver while there is already a driver exiting atm.
+	CPed *driver = veh->pDriver;
+	if (driver && driver->m_nPedState == PED_DRIVING && !veh->bIsBus && driver->m_objective == OBJECTIVE_LEAVE_CAR
+		&& (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || ped->m_nPedState == PED_CARJACK)) {
+
+		if (!ped->IsPlayer() && (ped->CharCreatedBy != MISSION_CHAR || driver->IsPlayer())) {
+			ped->QuitEnteringCar();
+			return;
+		}
+		if (driver->CharCreatedBy == MISSION_CHAR) {
+			PedSetOutCarCB(nil, veh->pDriver);
+			if (driver->m_pMyVehicle) {
+				driver->PositionPedOutOfCollision();
+			} else {
+				driver->m_pMyVehicle = veh;
+				driver->PositionPedOutOfCollision();
+				driver->m_pMyVehicle = nil;
+			}
+			veh->pDriver = nil;
+		} else {
+			driver->SetDead();
+			driver->FlagToDestroyWhenNextProcessed();
+			veh->pDriver = nil;
+		}
+	}
+
+	if (ped->bRemoveMeWhenIGotIntoCar) {
+		ped->bRemoveMeWhenIGotIntoCar = false;
+		ped->bRemoveFromWorld = true;
+	}
+	if (ped->bCollectBusFare) {
+		ped->bCollectBusFare = false;
+		if (FindPlayerPed())
+			FindPlayerPed()->m_nLastBusFareCollected += 5;
+	}
+
+	if (!ped->IsNotInWreckedVehicle() || ped->DyingOrDead())
+		return;
+
+	ped->bInVehicle = true;
+	if (ped->m_nPedType == PEDTYPE_PROSTITUTE) {
+		if (veh->pDriver) {
+			if (veh->pDriver->IsPlayer() && ped->CharCreatedBy == RANDOM_CHAR) {
+				CWorld::Players[CWorld::PlayerInFocus].m_nSexFrequency = 1000;
+				CWorld::Players[CWorld::PlayerInFocus].m_nNextSexMoneyUpdateTime = CTimer::GetTimeInMilliseconds() + 1000;
+				CWorld::Players[CWorld::PlayerInFocus].m_nNextSexFrequencyUpdateTime = CTimer::GetTimeInMilliseconds() + 3000;
+				CWorld::Players[CWorld::PlayerInFocus].m_pHooker = (CCivilianPed*)ped;
+			}
+		}
+	}
+	if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || ped->m_nPedState == PED_CARJACK)
+		veh->bIsBeingCarJacked = false;
+
+	if (veh->m_nNumGettingIn)
+		--veh->m_nNumGettingIn;
+
+	if (ped->IsPlayer() && ((CPlayerPed*)ped)->m_bAdrenalineActive)
+		((CPlayerPed*)ped)->ClearAdrenaline();
+
+	if (veh->IsBoat()) {
+		if (ped->IsPlayer()) {
+			CCarCtrl::RegisterVehicleOfInterest(veh);
+			if (veh->GetStatus() == STATUS_SIMPLE) {
+				veh->m_vecMoveSpeed = CVector(0.0f, 0.0f, -0.00001f);
+				veh->m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
+			}
+			veh->SetStatus(STATUS_PLAYER);
+			AudioManager.PlayerJustGotInCar();
+		}
+		veh->SetDriver(ped);
+		if (!veh->bEngineOn)
+			veh->bEngineOn = true;
+
+		ped->SetPedState(PED_DRIVING);
+		ped->StopNonPartialAnims();
+		ped->RemoveWeaponWhenEnteringVehicle();
+		return;
+	}
+
+	if (ped->m_pVehicleAnim)
+		ped->m_pVehicleAnim->blendDelta = -1000.0f;
+
+	ped->bDoBloodyFootprints = false;
+	if (veh->m_nAlarmState == -1)
+		veh->m_nAlarmState = 15000;
+
+	if (ped->IsPlayer()) {
+		if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || veh->IsBike()) {
+			if (veh->GetStatus() == STATUS_SIMPLE) {
+				veh->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
+				veh->m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
+			}
+			veh->SetStatus(STATUS_PLAYER);
+		}
+		AudioManager.PlayerJustGotInCar();
+	} else if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
+		if (veh->GetStatus() == STATUS_SIMPLE) {
+			veh->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
+			veh->m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
+		}
+		veh->SetStatus(STATUS_PHYSICS);
+	}
+	
+	if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
+		for (int i = 0; i < veh->m_nNumMaxPassengers; ++i) {
+			CPed *passenger = veh->pPassengers[i];
+			if (passenger && !passenger->bStayInCarOnJack && !passenger->bHeldHostageInCar && (passenger->m_leader != ped || !ped->bIsLeader)) {
+				passenger->SetObjective(OBJECTIVE_LEAVE_CAR, veh);
+				passenger->m_leaveCarTimer = CTimer::GetTimeInMilliseconds();
+			}
+		}
+	}
+
+	if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || ped->m_nPedState == PED_CARJACK) {
+		veh->SetDriver(ped);
+		if (veh->VehicleCreatedBy == PARKED_VEHICLE) {
+			veh->VehicleCreatedBy = RANDOM_VEHICLE;
+			++CCarCtrl::NumRandomCars;
+			--CCarCtrl::NumParkedCars;
+		}
+		if (veh->bIsAmbulanceOnDuty) {
+			veh->bIsAmbulanceOnDuty = false;
+			--CCarCtrl::NumAmbulancesOnDuty;
+		}
+		if (veh->bIsFireTruckOnDuty) {
+			veh->bIsFireTruckOnDuty = false;
+			--CCarCtrl::NumFiretrucksOnDuty;
+		}
+		if (ped->m_nPedType == PEDTYPE_COP && veh->IsLawEnforcementVehicle())
+			veh->ChangeLawEnforcerState(true);
+
+		if (!veh->bEngineOn) {
+			veh->bEngineOn = true;
+			DMAudio.PlayOneShot(ped->m_audioEntityId, SOUND_CAR_ENGINE_START, 1.0f);
+		}
+		if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER && ped->CharCreatedBy == RANDOM_CHAR
+			&& ped != FindPlayerPed() && ped->m_nPedType != PEDTYPE_EMERGENCY) {
+
+			CCarCtrl::JoinCarWithRoadSystem(veh);
+			veh->AutoPilot.m_nCarMission = MISSION_CRUISE;
+			veh->AutoPilot.m_nTempAction = TEMPACT_NONE;
+			veh->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
+			veh->AutoPilot.m_nCruiseSpeed = 25;
+		}
+		ped->SetPedState(PED_DRIVING);
+		if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
+
+			if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT
+				|| ped->m_prevObjective == OBJECTIVE_SPRINT_TO_AREA || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT)
+				ped->m_prevObjective = OBJECTIVE_NONE;
+
+			ped->RestorePreviousObjective();
+		}
+
+	} else {
+
+		bool slowDown = false;
+		if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && veh->pDriver && ped->CharCreatedBy == RANDOM_CHAR)
+			slowDown = true;
+
+		// VC also has a dead condition in here.
+
+		if (veh->IsBike()) {
+			veh->AddPassenger(ped, 0);
+		} else if (veh->bIsBus) {
+			veh->AddPassenger(ped);
+		} else {
+			switch (ped->m_vehEnterType) {
+				case CAR_DOOR_RF:
+					veh->AddPassenger(ped, 0);
+					break;
+				case CAR_DOOR_RR:
+					veh->AddPassenger(ped, 2);
+					break;
+				case CAR_DOOR_LR:
+					veh->AddPassenger(ped, 1);
+					break;
+				default:
+					veh->AddPassenger(ped);
+				break;
+			}
+		}
+		ped->SetPedState(PED_DRIVING);
+		if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT
+			|| ped->m_prevObjective == OBJECTIVE_SPRINT_TO_AREA || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT)
+			ped->m_prevObjective = OBJECTIVE_NONE;
+
+		ped->RestorePreviousObjective();
+
+		// VC has conditional OBJECTIVE_LEAVE_CAR here, which runs if it entered the first dead condition.
+
+		if(slowDown)
+			veh->AutoPilot.m_nCruiseSpeed = 17;
+	}
+
+	int8 doorFlag;
+	if (veh->IsBike()) {
+		doorFlag = GetBikeDoorFlagInclJumpInFromFront(ped->m_vehEnterType);
+	} else {
+		doorFlag = GetEnterCarDoorFlag(ped->m_vehEnterType, veh->m_nNumMaxPassengers);
+	}
+
+	veh->m_nGettingInFlags &= ~doorFlag;
+
+	if (veh->bIsBus && !veh->m_nGettingInFlags)
+		((CAutomobile*)veh)->SetBusDoorTimer(1000, 1);
+
+	switch (ped->m_objective) {
+		case OBJECTIVE_KILL_CHAR_ON_FOOT:
+		case OBJECTIVE_KILL_CHAR_ANY_MEANS:
+		case OBJECTIVE_LEAVE_CAR:
+		case OBJECTIVE_FOLLOW_CAR_IN_CAR:
+		case OBJECTIVE_GOTO_AREA_ANY_MEANS:
+		case OBJECTIVE_GOTO_AREA_ON_FOOT:
+		case OBJECTIVE_RUN_TO_AREA:
+		case OBJECTIVE_GOTO_SEAT_ON_FOOT:
+		case OBJECTIVE_GOTO_ATM_ON_FOOT:
+		case OBJECTIVE_GOTO_BUS_STOP_ON_FOOT:
+		case OBJECTIVE_GOTO_PIZZA_ON_FOOT:
+		case OBJECTIVE_GOTO_SHELTER_ON_FOOT:
+		case OBJECTIVE_SPRINT_TO_AREA:
+		case OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT:
 			break;
 		default:
-			Error("Unknown formation type, PedAI.cpp");
-			break;
+			ped->SetObjective(OBJECTIVE_NONE);
+	}
+
+	ped->AddInCarAnims(veh, veh->pDriver == ped);
+	if (veh->bIsBus)
+		ped->bRenderPedInCar = false;
+
+	// FIX: RegisterVehicleOfInterest not just registers the vehicle, but also updates register time. So remove the IsThisVehicleInteresting check.
+#ifndef FIX_BUGS
+	if (ped->IsPlayer() && !CCarCtrl::IsThisVehicleInteresting(veh) && veh->VehicleCreatedBy != MISSION_VEHICLE) {
+#else
+	if (ped->IsPlayer() && veh->VehicleCreatedBy != MISSION_VEHICLE) {
+#endif
+		CCarCtrl::RegisterVehicleOfInterest(veh);
+
+		if (!veh->bHasBeenOwnedByPlayer && veh->VehicleCreatedBy != MISSION_VEHICLE)
+			CEventList::RegisterEvent(EVENT_STEAL_CAR, EVENT_ENTITY_VEHICLE, veh, ped, 1500);
+
+		veh->bHasBeenOwnedByPlayer = true;
+	}
+	ped->bChangedSeat = true;
+}
+
+// --MIAMI: Done, but what is TODO_CHAR??
+bool
+CPed::CanBeDeleted(void)
+{
+	if (bInVehicle)
+		return false;
+
+	switch (CharCreatedBy) {
+		case RANDOM_CHAR:
+			return true;
+		case MISSION_CHAR:
+			return false;
+		case TODO_CHAR:
+			return false;
+		default:
+			return true;
+	}
+}
+
+//--MIAMI: done
+bool
+CPed::CanBeDeletedEvenInVehicle(void)
+{
+	switch (CharCreatedBy) {
+		case RANDOM_CHAR:
+			return true;
+		case MISSION_CHAR:
+			return false;
+		case TODO_CHAR:
+			return false;
+		default:
+			return true;
 	}
-	m_pedFormation = type;
 }
 
 // --MIAMI: Done
 void
-CPed::SetFollowRoute(int16 currentPoint, int16 routeType)
+CPed::AddWeaponModel(int id)
 {
-	m_routeLastPoint = currentPoint;
-	m_routeType = routeType;
-	m_routePointsBeingPassed = 1;
-	m_routePointsPassed = 0;
-	m_objective = OBJECTIVE_FOLLOW_ROUTE;
-	m_routeStartPoint = CRouteNode::GetRouteStart(currentPoint);
-	m_nextRoutePointPos = CRouteNode::GetPointPosition(GetNextPointOnRoute());
+	if (id != -1) {
+		if (m_pWeaponModel)
+			RemoveWeaponModel(-1);
+
+		m_pWeaponModel = (RpAtomic*)CModelInfo::GetModelInfo(id)->CreateInstance();
+		CModelInfo::GetModelInfo(id)->AddRef();
+		m_wepModelID = id;
+
+		if (IsPlayer() && id == MI_MINIGUN)
+			((CPlayerPed*)this)->m_pMinigunTopAtomic = (RpAtomic*)CModelInfo::GetModelInfo(MI_MINIGUN2)->CreateInstance();
+	}
 }
 
-// "Wander range" state is unused in game, and you can't use it without SetWanderRange anyway
+static RwObject*
+RemoveAllModelCB(RwObject *object, void *data)
+{
+	RpAtomic *atomic = (RpAtomic*)object;
+	if (CVisibilityPlugins::GetAtomicModelInfo(atomic)) {
+		RpClumpRemoveAtomic(RpAtomicGetClump(atomic), atomic);
+		RpAtomicDestroy(atomic);
+	}
+	return object;
+}
+
+// --MIAMI: Done
 void
-CPed::WanderRange(void)
+CPed::RemoveWeaponModel(int modelId)
 {
-	bool arrived = Seek();
-	if (arrived) {
-		Idle();
-		if ((m_randomSeed + 3 * CTimer::GetFrameCounter()) % 1000 > 997) {
-			CVector2D newCoords2D = m_wanderRangeBounds->GetRandomPointInRange();
-			SetSeek(CVector(newCoords2D.x, newCoords2D.y, GetPosition().z), 2.5f);
+	// modelId is not used!! This function just removes the current weapon.
+	if(m_pWeaponModel){
+		if (modelId == -1
+			|| CVisibilityPlugins::GetAtomicModelInfo(m_pWeaponModel) == CModelInfo::GetModelInfo(modelId)) {
+			CVisibilityPlugins::GetAtomicModelInfo(m_pWeaponModel)->RemoveRef();
+			RwFrame* frm = RpAtomicGetFrame(m_pWeaponModel);
+			RpAtomicDestroy(m_pWeaponModel);
+			RwFrameDestroy(frm);
+			m_pWeaponModel = nil;
 		}
 	}
+
+	if (IsPlayer() && (modelId == -1 || modelId == MI_MINIGUN)) {
+		RpAtomic* &atm = ((CPlayerPed*)this)->m_pMinigunTopAtomic;
+		if (atm) {
+			RwFrame *frm = RpAtomicGetFrame(atm);
+			RpAtomicDestroy(atm);
+			RwFrameDestroy(frm);
+			atm = nil;
+		}
+	}
+	m_wepModelID = -1;
 }
 
 // --MIAMI: Done
-bool
-CPed::WillChat(CPed *stranger)
+void
+CPed::RequestDelayedWeapon()
 {
-	if (m_pNextPathNode && m_pLastPathNode) {
-		if (m_pNextPathNode != m_pLastPathNode && ThePaths.TestCrossesRoad(m_pNextPathNode, m_pLastPathNode)) {
-			return false;
+	if (m_delayedWeapon != WEAPONTYPE_UNIDENTIFIED) {
+		int modelId1 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModelId;
+		int modelId2 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModel2Id;
+		if (modelId1 != -1)
+			CStreaming::RequestModel(modelId1, STREAMFLAGS_DEPENDENCY);
+		if (modelId2 != -1)
+			CStreaming::RequestModel(modelId2, STREAMFLAGS_DEPENDENCY);
+
+		if ((modelId1 == -1 || CStreaming::HasModelLoaded(modelId1))
+			&& (modelId2 == -1 || CStreaming::HasModelLoaded(modelId2))) {
+			GiveWeapon(m_delayedWeapon, m_delayedWeaponAmmo, 1);
+			m_delayedWeapon = WEAPONTYPE_UNIDENTIFIED;
 		}
 	}
-	if (m_nSurfaceTouched == SURFACE_TARMAC)
-		return false;
-	if (stranger == this)
-		return false;
-	if (m_nPedType == stranger->m_nPedType)
-		return true;
-	if (m_nPedType == PEDTYPE_CRIMINAL)
-		return false;
-	if (stranger->m_nPedType == PEDTYPE_COP)
-		return false;
-	if (stranger->IsPlayer())
-		return false;
-	if ((IsGangMember() || stranger->IsGangMember()) && m_nPedType != stranger->m_nPedType)
-		return false;
-	return true;
 }
 
-#ifdef GTA_TRAIN
+// --MIAMI: Done
 void
-CPed::SetEnterTrain(CVehicle *train, uint32 unused)
+CPed::GiveDelayedWeapon(eWeaponType weapon, uint32 ammo)
 {
-	if (m_nPedState == PED_ENTER_TRAIN || !((CTrain*)train)->Doors[0].IsFullyOpen())
-		return;
+	m_delayedWeapon = weapon;
+	m_delayedWeaponAmmo = ammo;
+	if (m_delayedWeapon != WEAPONTYPE_UNIDENTIFIED) {
+		int modelId1 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModelId;
+		int modelId2 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModel2Id;
+		if (modelId1 != -1)
+			CStreaming::RequestModel(modelId1, STREAMFLAGS_DEPENDENCY);
+		if (modelId2 != -1)
+			CStreaming::RequestModel(modelId2, STREAMFLAGS_DEPENDENCY);
 
-	/*
-	// Not used
-	CVector enterPos;
-	GetNearestTrainPedPosition(train, enterPos);
-	*/
-	m_fRotationCur = train->GetForward().Heading() - HALFPI;
-	m_pMyVehicle = train;
-	m_pMyVehicle->RegisterReference((CEntity **) &m_pMyVehicle);
+		if ((modelId1 == -1 || CStreaming::HasModelLoaded(modelId1))
+			&& (modelId2 == -1 || CStreaming::HasModelLoaded(modelId2))) {
+			GiveWeapon(m_delayedWeapon, m_delayedWeaponAmmo, true);
+			m_delayedWeapon = WEAPONTYPE_UNIDENTIFIED;
+		}
+	}
+}
 
-	m_nPedState = PED_ENTER_TRAIN;
-	m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_TRAIN_GETIN, 4.0f);
-	m_pVehicleAnim->SetFinishCallback(PedSetInTrainCB, this);
-	bUsesCollision = false;
-	LineUpPedWithTrain();
-	if (IsPlayer()) {
-		if (((CPlayerPed*)this)->m_bAdrenalineActive)
-			((CPlayerPed*)this)->ClearAdrenaline();
+// --MIAMI: Done
+int32
+CPed::GiveWeapon(eWeaponType weaponType, uint32 ammo, bool unused)
+{
+	int slot = GetWeaponSlot(weaponType);
+
+	if (m_weapons[slot].m_eWeaponType == weaponType) {
+		GetWeapon(slot).m_nAmmoTotal += ammo;
+		if (weaponType < WEAPONTYPE_TOTALWEAPONS && weaponType > WEAPONTYPE_UNARMED && CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType] >= 0) {
+
+			// Looks like abandoned idea. This block never runs, ms_aMaxAmmoForWeapon is always -1.
+			GetWeapon(slot).m_nAmmoTotal = Min(CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType], GetWeapon(slot).m_nAmmoTotal);
+		} else {
+			GetWeapon(slot).m_nAmmoTotal = Min(99999, GetWeapon(slot).m_nAmmoTotal);
+		}
+		GetWeapon(slot).Reload();
+		if (GetWeapon(slot).m_eWeaponState == WEAPONSTATE_OUT_OF_AMMO && GetWeapon(slot).m_nAmmoTotal > 0)
+			GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
+	} else {
+		if (HasWeaponSlot(slot)) {
+
+			// TODO(Miami): Make an enum for that
+			if (slot == 4 || slot == 5 || slot == 6)
+				ammo += GetWeapon(slot).m_nAmmoTotal;
+
+			RemoveWeaponModel(CWeaponInfo::GetWeaponInfo(GetWeapon(slot).m_eWeaponType)->m_nModelId);
+			GetWeapon(slot).Shutdown();
+		}
+		GetWeapon(slot).Initialise(weaponType, ammo);
+		if (slot == m_currentWeapon && !bInVehicle) {
+			AddWeaponModel(CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_nModelId);
+		}
 	}
+	if (GetWeapon(slot).m_eWeaponState != WEAPONSTATE_OUT_OF_AMMO)
+		GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
+
+	return slot;
 }
-#endif
 
-// --MIAMI: Done, but what is this parameter for?
+// --MIAMI: Done
+int
+CPed::GetWeaponSlot(eWeaponType weaponType)
+{
+	return CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot;
+}
+
+// --MIAMI: Done
 void
-CPed::SetDuck(uint32 time, bool sth)
+CPed::SetCurrentWeapon(int slot)
 {
-	if (bIsDucking || CTimer::GetTimeInMilliseconds() <= m_duckTimer && !sth) {
-		if (sth && CTimer::GetTimeInMilliseconds() + time > m_duckTimer)
-			m_duckTimer = CTimer::GetTimeInMilliseconds() + time;
+	if (slot == -1)
 		return;
+
+	CWeaponInfo* weaponInfo;
+	if (GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED) {
+		weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
+		RemoveWeaponModel(weaponInfo->m_nModelId);
 	}
+	m_currentWeapon = slot;
 
-	CAnimBlendAssociation *duckAssoc;
-	if (bCrouchWhenShooting) {
-		duckAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_WEAPON_CROUCH, 4.0f);
-		duckAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
-		bIsDucking = true;
-		m_duckTimer = CTimer::GetTimeInMilliseconds() + time;
-	} else {
-		CAnimBlendAssociation *duckAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_DOWN);
-		if (!duckAssoc || duckAssoc->blendDelta < 0.0f) {
-			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_DUCK_DOWN, 4.0f);
-			bIsDucking = true;
-			m_duckTimer = CTimer::GetTimeInMilliseconds() + time;
-		}
+	if (FindPlayerPed() && IsPlayer())
+		((CPlayerPed*)this)->m_nSelectedWepSlot = m_currentWeapon;
+
+	if (HasWeaponSlot(slot)) {
+		weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
+		AddWeaponModel(weaponInfo->m_nModelId);
 	}
 }
 
 // --MIAMI: Done
 void
-CPed::SeekBoatPosition(void)
+CPed::SetCurrentWeapon(eWeaponType weaponType)
 {
-	if (m_carInObjective && !m_carInObjective->pDriver) {
-		CVehicleModelInfo *boatModel = m_carInObjective->GetModelInfo();
-
-		CVector enterOffset;
-		enterOffset = boatModel->GetFrontSeatPosn();
-		enterOffset.x = 0.0f;
-		CMatrix boatMat(m_carInObjective->GetMatrix());
-		SetMoveState(PEDMOVE_WALK);
-		m_vecSeekPos = boatMat * enterOffset;
-		if (Seek()) {
-			// We arrived to the boat
-			m_vehEnterType = 0;
-			SetEnterCar(m_carInObjective, 0);
-		}
-	} else
-		RestorePreviousState();
+	SetCurrentWeapon(CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot);
 }
 
 // --MIAMI: Done
 void
-CPed::SetEnterCar(CVehicle *car, uint32 unused)
+CPed::GrantAmmo(eWeaponType weaponType, uint32 ammo)
 {
-	if (CCranes::IsThisCarBeingCarriedByAnyCrane(car)) {
-		RestorePreviousState();
-		RestorePreviousObjective();
-	} else {
-		uint8 doorFlag;
-		eDoors door;
-		if (car->IsBike()) {
-			switch (m_vehEnterType) {
-				case CAR_DOOR_RF:
-					doorFlag = CAR_DOOR_FLAG_RF | CAR_DOOR_FLAG_LF;
-					door = DOOR_FRONT_RIGHT;
-					break;
-				case CAR_DOOR_RR:
-					doorFlag = CAR_DOOR_FLAG_RR | CAR_DOOR_FLAG_LR;
-					door = DOOR_REAR_RIGHT;
-					break;
-				case CAR_WING_LF:
-				case CAR_WING_LR:
-				case CAR_BONNET:
-				case CAR_BOOT:
-					doorFlag = CAR_DOOR_FLAG_UNKNOWN;
-					break;
-				case CAR_DOOR_LF:
-				case CAR_WINDSCREEN:
-					doorFlag = CAR_DOOR_FLAG_RF | CAR_DOOR_FLAG_LF;
-					door = DOOR_FRONT_LEFT;
-					break;
-				case CAR_DOOR_LR:
-					doorFlag = CAR_DOOR_FLAG_RR | CAR_DOOR_FLAG_LR;
-					door = DOOR_REAR_LEFT;
-					break;
-			}
-		} else {
-			switch (m_vehEnterType) {
-				case CAR_DOOR_RF:
-					doorFlag = CAR_DOOR_FLAG_RF;
-					door = DOOR_FRONT_RIGHT;
-					break;
-				case CAR_DOOR_RR:
-					doorFlag = CAR_DOOR_FLAG_RR;
-					door = DOOR_REAR_RIGHT;
-					break;
-				case CAR_DOOR_LF:
-					if(car->m_nNumMaxPassengers != 0)
-						doorFlag = CAR_DOOR_FLAG_LF;
-					else
-						doorFlag = CAR_DOOR_FLAG_LF | CAR_DOOR_FLAG_LR;
+	int slot = CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot;
+	if (slot == -1)
+		return;
 
-					door = DOOR_FRONT_LEFT;
-					break;
-				case CAR_DOOR_LR:
-					if (car->m_nNumMaxPassengers != 0)
-						doorFlag = CAR_DOOR_FLAG_LR;
-					else
-						doorFlag = CAR_DOOR_FLAG_LF | CAR_DOOR_FLAG_LR;
+	GetWeapon(slot).m_nAmmoTotal += ammo;
+	if (weaponType < WEAPONTYPE_TOTALWEAPONS && weaponType > WEAPONTYPE_UNARMED && CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType] >= 0) {
 
-					door = DOOR_REAR_LEFT;
-					break;
-				default:
-					doorFlag = CAR_DOOR_FLAG_UNKNOWN;
-					break;
-			}
-		}
-		if (!IsPedInControl() || m_fHealth <= 0.0f
-			|| doorFlag & car->m_nGettingInFlags || doorFlag & car->m_nGettingOutFlags
-			|| car->bIsBeingCarJacked || m_pVehicleAnim
-			|| doorFlag && !car->IsDoorReady(door) && !car->IsDoorFullyOpen(door))
-			SetMoveState(PEDMOVE_STILL);
-		else
-			SetEnterCar_AllClear(car, m_vehEnterType, doorFlag);
+		// Looks like abandoned idea. This block never runs, ms_aMaxAmmoForWeapon is always -1.
+		GetWeapon(slot).m_nAmmoTotal = Min(CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType], GetWeapon(slot).m_nAmmoTotal);
+	} else {
+		GetWeapon(slot).m_nAmmoTotal = Min(99999, GetWeapon(slot).m_nAmmoTotal);
 	}
+
+	if (GetWeapon(slot).m_eWeaponState == WEAPONSTATE_OUT_OF_AMMO && GetWeapon(slot).m_nAmmoTotal > 0)
+		GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
 }
 
 // --MIAMI: Done
 void
-CPed::SetRadioStation(void)
+CPed::SetAmmo(eWeaponType weaponType, uint32 ammo)
 {
-	CPedModelInfo* modelInfo = (CPedModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
-
-	if (IsPlayer() || !m_pMyVehicle || m_pMyVehicle->pDriver != this)
+	int slot = CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot;
+	if (slot == -1)
 		return;
 
-	if (GetModelIndex() != MI_PGA && GetModelIndex() != MI_PGB) {
-		if (m_pMyVehicle->m_nRadioStation != modelInfo->radio1 && m_pMyVehicle->m_nRadioStation != modelInfo->radio2) {
-			if (CGeneral::GetRandomTrueFalse())
-				m_pMyVehicle->m_nRadioStation = modelInfo->radio1;
-			else
-				m_pMyVehicle->m_nRadioStation = modelInfo->radio2;
-		}
+	GetWeapon(slot).m_nAmmoTotal = ammo;
+	if (weaponType < WEAPONTYPE_TOTALWEAPONS && weaponType > WEAPONTYPE_UNARMED && CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType] >= 0) {
+
+		// Looks like abandoned idea. This block never runs, ms_aMaxAmmoForWeapon is always -1.
+		GetWeapon(slot).m_nAmmoTotal = Min(CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType], GetWeapon(slot).m_nAmmoTotal);
 	} else {
-		m_pMyVehicle->m_nRadioStation = DMAudio.GetFavouriteRadioStation();
+		GetWeapon(slot).m_nAmmoTotal = Min(99999, GetWeapon(slot).m_nAmmoTotal);
+	}
+	int32 newClip = GetWeapon(slot).m_nAmmoTotal;
+	if (newClip >= GetWeapon(slot).m_nAmmoInClip)
+		newClip = GetWeapon(slot).m_nAmmoInClip;
+	GetWeapon(slot).m_nAmmoInClip = newClip;
+
+	if (GetWeapon(slot).m_eWeaponState == WEAPONSTATE_OUT_OF_AMMO && GetWeapon(slot).m_nAmmoTotal > 0)
+		GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
+}
+
+// --MIAMI: Done
+void
+CPed::ClearWeapons(void)
+{
+	RemoveWeaponModel(-1);
+	for (int i = 0; i < ARRAY_SIZE(m_weapons); i++) {
+		GetWeapon(i).Shutdown();
 	}
+	SetCurrentWeapon(WEAPONTYPE_UNARMED);
 }
 
-inline bool
-CPed::IsNotInWreckedVehicle()
+// --MIAMI: Done
+void
+CPed::RemoveWeaponWhenEnteringVehicle(void)
+{
+	if (IsPlayer() && HasWeaponSlot(5) && GetWeapon(5).m_nAmmoTotal > 0 && ((CPlayerPed*)this)->GetPlayerInfoForThisPlayerPed()->m_bDriveByAllowed) {
+		if (m_storedWeapon == WEAPONTYPE_UNIDENTIFIED)
+			m_storedWeapon = GetWeapon()->m_eWeaponType;
+		SetCurrentWeapon(GetWeapon(5).m_eWeaponType);
+	} else {
+		CWeaponInfo *ourWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
+		RemoveWeaponModel(ourWeapon->m_nModelId);
+	}
+}
+// --MIAMI: Done, but enumarate weapon slots
+void
+CPed::ReplaceWeaponWhenExitingVehicle(void)
 {
-	return m_pMyVehicle != nil && m_pMyVehicle->GetStatus() != STATUS_WRECKED;
+	eWeaponType weaponType = GetWeapon()->m_eWeaponType;
+
+	// If it's Uzi, we may have stored weapon. Uzi is the only gun we can use in car.
+	if (IsPlayer() && GetWeaponSlot(weaponType) == 5) {
+		if (m_storedWeapon != WEAPONTYPE_UNIDENTIFIED) {
+			SetCurrentWeapon(m_storedWeapon);
+			m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
+		}
+	} else {
+		AddWeaponModel(CWeaponInfo::GetWeaponInfo(weaponType)->m_nModelId);
+	}
 }
 
 // --MIAMI: Done
@@ -16857,218 +5092,1284 @@ CPed::PreRender(void)
 	}
 }
 
+CVector vecTestTemp(-1.0f, -1.0f, -1.0f);
+
 // --MIAMI: Done
 void
-CPed::ProcessBuoyancy(void)
+CPed::Render(void)
 {
-	float buoyancyLevel = 1.1f;
-	static uint32 nGenerateRaindrops = 0;
-	static uint32 nGenerateWaterCircles = 0;
-	CRGBA color;
+	if (bInVehicle && m_pMyVehicle && m_nPedState != PED_EXIT_CAR && m_nPedState != PED_DRAG_FROM_CAR) {
+		if (!bRenderPedInCar)
+			return;
+
+		if (!m_pMyVehicle->IsBike() && !IsPlayer()) {
+			float camDistSq = (TheCamera.GetPosition() - GetPosition()).MagnitudeSqr();
+			if (camDistSq > SQR((m_pMyVehicle->IsBoat() ? 40.0f : 25.0f) * TheCamera.LODDistMultiplier))
+				return;
+		}
+	}
+
+	CEntity::Render();
+
+	if(m_pWeaponModel){
+		RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
+		int idx = RpHAnimIDGetIndex(hier, m_pFrames[PED_HANDR]->nodeID);
+		RwMatrix *mat = &RpHAnimHierarchyGetMatrixArray(hier)[idx];
+		RwFrame *frame = RpAtomicGetFrame(m_pWeaponModel);
+		*RwFrameGetMatrix(frame) = *mat;
+		RwFrameUpdateObjects(frame);
+		RpAtomicRender(m_pWeaponModel);
+		if (IsPlayer()) {
+			CPlayerPed *player = (CPlayerPed*)this;
+			if (player->m_pMinigunTopAtomic) {
+				frame = RpAtomicGetFrame(player->m_pMinigunTopAtomic);
+				*RwFrameGetMatrix(frame) = *mat;
 
+				player->m_fGunSpinAngle = player->m_fGunSpinSpeed * CTimer::GetTimeStep() + player->m_fGunSpinAngle;
+				if (player->m_fGunSpinAngle > TWOPI)
+					player->m_fGunSpinAngle -= TWOPI;
+
+				CMatrix mgTopMat, localAdjMat;
+				mgTopMat.Attach(RwFrameGetMatrix(frame));
+				localAdjMat.SetRotateX(player->m_fGunSpinAngle);
+				localAdjMat.Rotate(DEGTORAD(-4.477f)* vecTestTemp.x, DEGTORAD(29.731f) * vecTestTemp.y, DEGTORAD(1.064f) * vecTestTemp.z);
+				localAdjMat.GetPosition() += CVector(0.829f, -0.001f, 0.226f);
+				mgTopMat = mgTopMat * localAdjMat;
+				mgTopMat.UpdateRW();
+
+				RwFrameUpdateObjects(frame);
+				RpAtomicRender(player->m_pMinigunTopAtomic);
+			}
+		}
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::CheckAroundForPossibleCollisions(void)
+{
+	CVector ourCentre, objCentre;
+	CEntity *objects[8];
+	int16 maxObject;
+
+	if (CTimer::GetTimeInMilliseconds() <= m_nPedStateTimer)
+		return;
+
+	GetBoundCentre(ourCentre);
+
+	CWorld::FindObjectsInRange(ourCentre, 10.0f, true, &maxObject, 6, objects, false, true, false, true, false);
+	for (int i = 0; i < maxObject; i++) {
+		CEntity *object = objects[i];
+		if (bRunningToPhone) {
+			if (gPhoneInfo.PhoneAtThisPosition(object->GetPosition()))
+				break;
+		}
+		object->GetBoundCentre(objCentre);
+		float radius = object->GetBoundRadius();
+		if (radius > 4.5f || radius < 1.0f)
+			radius = 1.0f;
+
+		// Developers gave up calculating Z diff. later according to asm.
+		float diff = CVector(ourCentre - objCentre).MagnitudeSqr2D();
+
+		if (sq(radius + 1.0f) > diff)
+			m_fRotationDest += DEGTORAD(22.5f);
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::SetIdle(void)
+{
+	if (m_nPedState != PED_IDLE && m_nPedState != PED_MUG && m_nPedState != PED_FLEE_ENTITY) {
+		if (m_nPedState == PED_AIM_GUN)
+			ClearPointGunAt();
+
+		SetPedState(PED_IDLE);
+		SetMoveState(PEDMOVE_STILL);
+		m_nLastPedState = PED_NONE;
+	}
+	if (m_nWaitState == WAITSTATE_FALSE) {
+		m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(2000, 4000);
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::Idle(void)
+{
+	CVehicle *veh = m_pMyVehicle;
+	if (veh && veh->m_nGettingOutFlags && m_vehEnterType) {
+
+		if (veh->m_nGettingOutFlags & GetCarDoorFlag(m_vehEnterType)) {
+
+			if (m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT) {
+
+				CVector doorPos = GetPositionToOpenCarDoor(veh, m_vehEnterType);
+				CVector doorDist = GetPosition() - doorPos;
+
+				if (doorDist.MagnitudeSqr() < sq(0.5f)) {
+					SetMoveState(PEDMOVE_WALK);
+					return;
+				}
+			}
+		}
+	}
+
+	if (m_nMoveState != PEDMOVE_STILL && !IsPlayer())
+		SetMoveState(PEDMOVE_STILL);
+
+	m_moved = CVector2D(0.0f, 0.0f);
+}
+
+// --MIAMI: Done
+void
+CPed::ClearPause(void)
+{
+	RestorePreviousState();
+}
+
+// --MIAMI: Done
+void
+CPed::Pause(void)
+{
+	m_moved = CVector2D(0.0f, 0.0f);
+	if (CTimer::GetTimeInMilliseconds() > m_leaveCarTimer)
+		ClearPause();
+}
+
+// --MIAMI: Done
+void
+CPed::SetFall(int extraTime, AnimationId animId, uint8 evenIfNotInControl)
+{
+	if (m_attachedTo)
+		return;
+
+	if (!IsPedInControl() && (!evenIfNotInControl || DyingOrDead()))
+		return;
+
+	ClearLookFlag();
+	ClearAimFlag();
+	SetStoredState();
+	SetPedState(PED_FALL);
+	CAnimBlendAssociation *fallAssoc = nil;
+	if (animId == NUM_STD_ANIMS) {
+		if (IsPlayer()) {
+			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_LHS);
+			if (!fallAssoc)
+				fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_RHS);
+		}
+	} else {
+		fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), animId);
+
+		if (fallAssoc) {
+			fallAssoc->SetCurrentTime(0.0f);
+			fallAssoc->blendAmount = 0.0f;
+			fallAssoc->blendDelta = 8.0f;
+			fallAssoc->SetRun();
+		}
+		else {
+			fallAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animId, 8.0f);
+		}
+		if (animId == ANIM_BIKE_FALL_R)
+			fallAssoc->SetCurrentTime(0.4f);
+	}
+
+	if (extraTime == -1) {
+		m_getUpTimer = UINT32_MAX;
+	} else if (fallAssoc) {
+		if (IsPlayer()) {
+			if (fallAssoc->animId == ANIM_CAR_ROLLOUT_LHS || fallAssoc->animId == ANIM_CAR_ROLLOUT_RHS) {
+				m_getUpTimer = 1000.0f * fallAssoc->hierarchy->totalLength
+					+ CTimer::GetTimeInMilliseconds()
+					- 1000.0f * fallAssoc->currentTime
+					+ 100.0f;
+			} else {
+				m_getUpTimer = 1000.0f * fallAssoc->hierarchy->totalLength
+					+ CTimer::GetTimeInMilliseconds()
+					+ 500.0f;
+			}
+		} else {
+			m_getUpTimer = 1000.0f * fallAssoc->hierarchy->totalLength
+				+ CTimer::GetTimeInMilliseconds()
+				+ extraTime
+				+ ((m_randomSeed + CTimer::GetFrameCounter()) % 1000);
+		}
+	} else {
+		m_getUpTimer = extraTime
+			+ CTimer::GetTimeInMilliseconds()
+			+ 1000
+			+ ((m_randomSeed + CTimer::GetFrameCounter()) % 1000);
+	}
+	bFallenDown = true;
+}
+
+// --MIAMI: Done
+void
+CPed::ClearFall(void)
+{
+	SetGetUp();
+}
+
+// --MIAMI: Done
+void
+CPed::Fall(void)
+{
+	if (m_getUpTimer != UINT32_MAX && CTimer::GetTimeInMilliseconds() > m_getUpTimer && bIsStanding)
+		ClearFall();
+
+	CAnimBlendAssociation *firstPartialAssoc;
+	CAnimBlendAssociation *fallAssoc;
+
+	if (IsPlayer() && (bKnockedUpIntoAir || bKnockedOffBike) && !bIsStanding) {
+		firstPartialAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
+
+		// What???
+		if (firstPartialAssoc && (firstPartialAssoc->animId == ANIM_FALL_BACK || firstPartialAssoc->animId == ANIM_FALL_FRONT))
+			fallAssoc = firstPartialAssoc;
+		else
+			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_BACK);
+
+		if (!fallAssoc)
+			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FRONT);
+
+		if (!fallAssoc && firstPartialAssoc && 0.8f * firstPartialAssoc->hierarchy->totalLength < firstPartialAssoc->currentTime) {
+			if (firstPartialAssoc->flags & ASSOC_FRONTAL) {
+				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_FRONT, 8.0f);
+			} else {
+				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_BACK, 8.0f);
+			}
+		} else if (fallAssoc && fallAssoc->blendAmount > 0.3f && fallAssoc->blendDelta >= 0.0f)	{
+			float time = fallAssoc->currentTime;
+
+			if (time > 0.667f && time - fallAssoc->timeStep <= 0.667f) {
+				fallAssoc->SetCurrentTime(0.0f);
+				fallAssoc->SetRun();
+			}
+		}
+	} else if ((bKnockedUpIntoAir || bKnockedOffBike) && bIsStanding && !bWasStanding) {
+		fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_BACK);
+
+		if (!fallAssoc)
+			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FRONT);
+
+		if (fallAssoc) {
+			bKnockedUpIntoAir = false;
+			bKnockedOffBike = false;
+			fallAssoc->speed = 3.0f;
+			if (IsPlayer())
+				Say(SOUND_PED_LAND);
+
+		} else {
+			firstPartialAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
+			if (firstPartialAssoc && !firstPartialAssoc->IsRunning()) {
+				bKnockedUpIntoAir = false;
+				bKnockedOffBike = false;
+			}
+		}
+	}
+}
+
+// --MIAMI: Done
+bool
+CPed::CheckIfInTheAir(void)
+{
 	if (bInVehicle)
+		return false;
+
+	CVector pos = GetPosition();
+	CColPoint foundColPoint;
+	CEntity *foundEntity;
+
+	float startZ = pos.z - 1.54f;
+	bool foundGround = CWorld::ProcessVerticalLine(pos, startZ, foundColPoint, foundEntity, true, true, false, true, false, false, nil);
+	if (!foundGround && m_nPedState != PED_JUMP)
+	{
+		pos.z -= FEET_OFFSET;
+		if (CWorld::TestSphereAgainstWorld(pos, 0.15f, this, true, false, false, false, false, false))
+			foundGround = true;
+	}
+	return !foundGround;
+}
+
+// --MIAMI: Done
+void
+CPed::SetInTheAir(void)
+{
+	if (bIsInTheAir)
 		return;
 
-	CVector buoyancyPoint;
-	CVector buoyancyImpulse;
+	bIsInTheAir = true;
+	CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_GLIDE, 4.0f);
+
+	if (m_nPedState == PED_ATTACK) {
+		ClearAttack();
+		ClearPointGunAt();
+	} else if (m_nPedState == PED_FIGHT) {
+		EndFight(ENDFIGHT_FAST);
+	}
+
+}
+
+// --MIAMI: Done
+void
+CPed::InTheAir(void)
+{
+	CColPoint foundCol;
+	CEntity *foundEnt;
+
+	CVector ourPos = GetPosition();
+	CVector bitBelow = GetPosition();
+	bitBelow.z -= 4.04f;
+
+	if (m_vecMoveSpeed.z < 0.0f && !bIsPedDieAnimPlaying) {
+		if (!DyingOrDead()) {
+			if (CWorld::ProcessLineOfSight(ourPos, bitBelow, foundCol, foundEnt, true, true, false, true, false, false, false)) {
+				if (GetPosition().z - foundCol.point.z < 1.3f || bIsStanding)
+					SetLanding();
+			} else if (m_nPedState != PED_ABSEIL && !RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FALL)) {
+				if (m_vecMoveSpeed.z < -0.1f)
+					CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_FALL, 4.0f);
+			}
+		}
+	}
+}
 
+// --MIAMI: Done
+void
+CPed::SetLanding(void)
+{
 	if (DyingOrDead())
-		buoyancyLevel = 1.8f;
+		return;
 
-	if (mod_Buoyancy.ProcessBuoyancy(this, GRAVITY * m_fMass * buoyancyLevel, &buoyancyPoint, &buoyancyImpulse)) {
-		bTouchingWater = true;
-		CEntity *entity;
-		CColPoint point;
-		if (CWorld::ProcessVerticalLine(GetPosition(), GetPosition().z - 3.0f, point, entity, false, true, false, false, false, false, nil)
-			&& entity->IsVehicle() && ((CVehicle*)entity)->IsBoat() && !entity->bRenderScorched) {
-			bIsInWater = false;
+	CAnimBlendAssociation *fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FALL);
+	CAnimBlendAssociation *landAssoc;
+
+	if (fallAssoc && bIsDrowning)
+		return;
+
+	RpAnimBlendClumpSetBlendDeltas(GetClump(), ASSOC_PARTIAL, -1000.0f);
+	if (fallAssoc || m_nPedType == PEDTYPE_COP && bKnockedUpIntoAir) {
+		landAssoc = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_COLLAPSE);
+		DMAudio.PlayOneShot(m_audioEntityId, SOUND_FALL_COLLAPSE, 1.0f);
+
+		if (IsPlayer())
+			Say(SOUND_PED_LAND);
+
+		if (m_nPedType == PEDTYPE_COP) {
+			if (bKnockedUpIntoAir)
+				bKnockedUpIntoAir = false;
+		}
+
+	} else {
+		landAssoc = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_LAND);
+		DMAudio.PlayOneShot(m_audioEntityId, SOUND_FALL_LAND, 1.0f);
+	}
+
+	landAssoc->SetFinishCallback(PedLandCB, this);
+	bIsInTheAir = false;
+	bIsLanding = true;
+}
+
+// --MIAMI: Done
+void
+CPed::SetGetUp(void)
+{
+	if (m_nPedState == PED_GETUP && bGetUpAnimStarted)
+		return;
+
+	if (!CanSetPedState())
+		return;
+
+	if (m_fHealth >= 1.0f || IsPedHeadAbovePos(-0.3f)) {
+		if (bUpdateAnimHeading) {
+			m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
+			m_fRotationCur -= HALFPI;
+			bUpdateAnimHeading = false;
+		}
+		if (m_nPedState != PED_GETUP) {
+			SetStoredState();
+			SetPedState(PED_GETUP);
+		}
+
+		CVehicle *collidingVeh = (CVehicle*)m_pCollidingEntity;
+		CVehicle *veh = (CVehicle*)CPedPlacement::IsPositionClearOfCars(&GetPosition());
+		if (veh && veh->m_vehType != VEHICLE_TYPE_BIKE && veh != m_attachedTo ||
+			collidingVeh && collidingVeh->IsVehicle() && collidingVeh->m_vehType != VEHICLE_TYPE_BIKE
+			&& ((uint8)(CTimer::GetFrameCounter() + m_randomSeed + 5) % 8 ||
+				 CCollision::ProcessColModels(GetMatrix(), *GetColModel(), collidingVeh->GetMatrix(), *collidingVeh->GetColModel(),
+					aTempPedColPts, nil, nil) > 0)) {
+
+			bGetUpAnimStarted = false;
+			if (IsPlayer())
+				InflictDamage(nil, WEAPONTYPE_RUNOVERBYCAR, CTimer::GetTimeStep(), PEDPIECE_TORSO, 0);
+			else if(CPad::GetPad(0)->ArePlayerControlsDisabled())
+				InflictDamage(nil, WEAPONTYPE_RUNOVERBYCAR, 1000.0f, PEDPIECE_TORSO, 0);
 			return;
 		}
-		color.r = (0.5f * CTimeCycle::GetDirectionalRed() + CTimeCycle::GetAmbientRed()) * 127.5f;
-		color.g = (0.5f * CTimeCycle::GetDirectionalBlue() + CTimeCycle::GetAmbientBlue()) * 127.5f;
-		color.b = (0.5f * CTimeCycle::GetDirectionalGreen() + CTimeCycle::GetAmbientGreen()) * 127.5f;
-		color.a = (CGeneral::GetRandomNumber() % 256 * 48.0f) + 48;
-		bIsInWater = true;
-		ApplyMoveForce(buoyancyImpulse);
-		if (!DyingOrDead()) {
-			if (bTryingToReachDryLand) {
-				if (buoyancyImpulse.z / m_fMass > GRAVITY * 0.4f * CTimer::GetTimeStep()) {
-					bTryingToReachDryLand = false;
-					CVector pos = GetPosition();
-					if (PlacePedOnDryLand()) {
-						if (m_fHealth > 20.0f)
-							InflictDamage(nil, WEAPONTYPE_DROWNING, 15.0f, PEDPIECE_TORSO, false);
+		bGetUpAnimStarted = true;
+		m_pCollidingEntity = nil;
+		bKnockedUpIntoAir = false;
+		bKnockedOffBike = false;
+		CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SPRINT);
+		if (animAssoc) {
+			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_RUN)) {
+				CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_RUN, 8.0f);
+			} else {
+				CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 8.0f);
+			}
+			animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+		}
 
-						if (bIsInTheAir) {
-							RpAnimBlendClumpSetBlendDeltas(GetClump(), ASSOC_PARTIAL, -1000.0f);
-							bIsInTheAir = false;
-						}
-						pos.z = pos.z - 0.8f;
-						CParticleObject::AddObject(POBJECT_PED_WATER_SPLASH, pos, CVector(0.0f, 0.0f, 0.0f), 0.0f, 50, color, true);
-						m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-						SetPedState(PED_IDLE);
-						return;
+		if (m_nWaitState == WAITSTATE_SUN_BATHE_IDLE) {
+			m_headingRate = 0.0f;
+
+			// TODO(Miami): Looks like that should've been another getup anim but R* forgot it. Visit here later
+			if (bFleeWhenStanding && m_threatEx)
+				animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
+			else
+				animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
+
+		} else if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_GETUP_FRONT, 1000.0f);
+		else
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f);
+
+		animAssoc->SetFinishCallback(PedGetupCB, this);
+	} else {
+		m_fHealth = 0.0f;
+		SetDie(NUM_STD_ANIMS, 4.0f, 0.0f);
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::Mug(void)
+{
+	if (m_pSeekTarget && m_pSeekTarget->IsPed()) {
+
+		if (CTimer::GetTimeInMilliseconds() <= m_attackTimer - 2000) {
+			if ((m_pSeekTarget->GetPosition() - GetPosition()).Magnitude() > 3.0f)
+				m_wepSkills = 50;
+
+			Say(SOUND_PED_MUGGING);
+			((CPed*)m_pSeekTarget)->Say(SOUND_PED_ROBBED);
+		} else {
+			SetWanderPath(CGeneral::GetRandomNumber() & 7);
+			SetFlee(m_pSeekTarget, 20000);
+		}
+
+	} else {
+		SetIdle();
+	}
+}
+
+// --MIAMI: Done
+// Unused
+void
+CPed::SetLook(float direction)
+{
+	if (IsPedInControl()) {
+		SetStoredState();
+		SetPedState(PED_LOOK_HEADING);
+		SetLookFlag(direction, false);
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::SetLook(CEntity* to)
+{
+	if (IsPedInControl()) {
+		SetStoredState();
+		SetPedState(PED_LOOK_ENTITY);
+		SetLookFlag(to, false);
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::SetLookTimer(int time)
+{
+	if (CTimer::GetTimeInMilliseconds() > m_lookTimer) {
+		m_lookTimer = CTimer::GetTimeInMilliseconds() + time;
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::SetAttackTimer(uint32 time)
+{
+	if (CTimer::GetTimeInMilliseconds() > m_attackTimer)
+		m_attackTimer = Max(m_shootTimer, CTimer::GetTimeInMilliseconds()) + time;
+}
+
+// --MIAMI: Done
+void
+CPed::SetShootTimer(uint32 time)
+{
+	if (CTimer::GetTimeInMilliseconds() > m_shootTimer) {
+		m_shootTimer = CTimer::GetTimeInMilliseconds() + time;
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::ClearLook(void)
+{
+	RestorePreviousState();
+	ClearLookFlag();
+}
+
+// --MIAMI: Done
+void
+CPed::Look(void)
+{
+	TurnBody();
+}
+
+// --MIAMI: Done
+bool
+CPed::TurnBody(void)
+{
+	bool turnDone = true;
+
+	if (m_pLookTarget)
+		m_fLookDirection = CGeneral::GetRadianAngleBetweenPoints(
+					m_pLookTarget->GetPosition().x,
+					m_pLookTarget->GetPosition().y,
+					GetPosition().x,
+					GetPosition().y);
+
+	float limitedLookDir = CGeneral::LimitRadianAngle(m_fLookDirection);
+	float currentRot = m_fRotationCur;
+
+	if (currentRot - PI > limitedLookDir)
+		limitedLookDir += 2 * PI;
+	else if (PI + currentRot < limitedLookDir)
+		limitedLookDir -= 2 * PI;
+
+	float neededTurn = currentRot - limitedLookDir;
+	m_fRotationDest = limitedLookDir;
+
+	if (Abs(neededTurn) > 0.05f) {
+		turnDone = false;
+		currentRot -= neededTurn * 0.2f;
+	}
+
+	m_fRotationCur = currentRot;
+	m_fLookDirection = limitedLookDir;
+	return turnDone;
+}
+
+// --MIAMI: Done
+void
+CPed::SetSeek(CVector pos, float distanceToCountDone)
+{
+	if (!IsPedInControl()
+		|| (m_nPedState == PED_SEEK_POS && m_vecSeekPos.x == pos.x && m_vecSeekPos.y == pos.y) || m_nPedState == PED_FOLLOW_PATH)
+		return;
+
+	if (!CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_bCanAimWithArm) {
+		ClearPointGunAt();
+	}
+
+	if (m_nPedState != PED_SEEK_POS)
+		SetStoredState();
+
+	SetPedState(PED_SEEK_POS);
+	m_distanceToCountSeekDone = distanceToCountDone;
+	m_vecSeekPos = pos;
+}
+// --MIAMI: Done
+void
+CPed::SetSeek(CEntity *seeking, float distanceToCountDone)
+{
+	if (!IsPedInControl())
+		return;
+
+	if (m_nPedState == PED_SEEK_ENTITY && m_pSeekTarget == seeking)
+		return;
+
+	if (!seeking || m_nPedState == PED_FOLLOW_PATH)
+		return;
+
+	if (m_nPedState != PED_SEEK_ENTITY)
+		SetStoredState();
+
+	SetPedState(PED_SEEK_ENTITY);
+	m_distanceToCountSeekDone = distanceToCountDone;
+	m_pSeekTarget = seeking;
+	m_pSeekTarget->RegisterReference((CEntity **) &m_pSeekTarget);
+	SetMoveState(PEDMOVE_STILL);
+}
+
+// --MIAMI: Done
+void
+CPed::ClearSeek(void)
+{
+	SetIdle();
+	bRunningToPhone = false;
+}
+
+// --MIAMI: Done
+bool
+CPed::Seek(void)
+{
+	float distanceToCountItDone = m_distanceToCountSeekDone;
+	eMoveState nextMove = PEDMOVE_NONE;
+
+	if (m_objective != OBJECTIVE_ENTER_CAR_AS_DRIVER) {
+
+		if (m_nPedState != PED_EXIT_TRAIN && m_nPedState != PED_ENTER_TRAIN && m_nPedState != PED_SEEK_IN_BOAT &&
+			m_objective != OBJECTIVE_ENTER_CAR_AS_PASSENGER && m_objective != OBJECTIVE_SOLICIT_VEHICLE && !bDuckAndCover) {
+			
+			if ((!m_pedInObjective || !m_pedInObjective->bInVehicle)
+				&& (CTimer::GetFrameCounter() + m_randomSeed + 60) % 32 == 0) {
+
+				CEntity *obstacle = CWorld::TestSphereAgainstWorld(m_vecSeekPos, 0.4f, nil,
+									false, true, false, false, false, false);
+
+				if (obstacle) {
+					if (!obstacle->IsVehicle() || ((CVehicle*)obstacle)->IsCar()) {
+						distanceToCountItDone = 2.5f;
+					} else {
+						CVehicleModelInfo *vehModel = (CVehicleModelInfo *)CModelInfo::GetModelInfo(obstacle->GetModelIndex());
+						float yLength = vehModel->GetColModel()->boundingBox.max.y
+										- vehModel->GetColModel()->boundingBox.min.y;
+						distanceToCountItDone = yLength * 0.55f;
 					}
 				}
 			}
 		}
-		float speedMult = 0.0f;
-		if (buoyancyImpulse.z / m_fMass > GRAVITY * CTimer::GetTimeStep()
-			|| mod_Buoyancy.m_waterlevel > GetPosition().z + 0.6f) {
-			speedMult = pow(0.9f, CTimer::GetTimeStep());
-			m_vecMoveSpeed.x *= speedMult;
-			m_vecMoveSpeed.y *= speedMult;
-			m_vecMoveSpeed.z *= speedMult;
-			bIsStanding = false;
-			bIsDrowning = true;
-			InflictDamage(nil, WEAPONTYPE_DROWNING, 3.0f * CTimer::GetTimeStep(), PEDPIECE_TORSO, 0);
+	}
+
+	if (!m_pSeekTarget && m_nPedState == PED_SEEK_ENTITY)
+		ClearSeek();
+
+	if (m_objective == OBJECTIVE_FOLLOW_CHAR_IN_FORMATION && !m_pedInObjective) {
+		m_objective = OBJECTIVE_NONE;
+		ClearObjective();
+		SetWanderPath(0);
+		return false;
+	}
+
+	float seekPosDist = (m_vecSeekPos - GetPosition()).Magnitude2D();
+	if (seekPosDist < 2.0f || m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT) {
+
+		if (m_objective == OBJECTIVE_FOLLOW_CHAR_IN_FORMATION) {
+
+			if (m_pedInObjective->m_nMoveState != PEDMOVE_STILL)
+				nextMove = m_pedInObjective->m_nMoveState;
+		} else
+			nextMove = PEDMOVE_WALK;
+
+	} else if (m_objective != OBJECTIVE_FOLLOW_CHAR_IN_FORMATION) {
+
+		if (m_objective == OBJECTIVE_SPRINT_TO_AREA)
+			nextMove = PEDMOVE_SPRINT;
+		else if (m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS || m_objective == OBJECTIVE_RUN_TO_AREA || bIsRunning)
+			nextMove = PEDMOVE_RUN;
+		else
+			nextMove = PEDMOVE_WALK;
+
+	} else if (seekPosDist <= 2.0f) {
+
+		if (m_pedInObjective->m_nMoveState != PEDMOVE_STILL)
+			nextMove = m_pedInObjective->m_nMoveState;
+
+	} else {
+		nextMove = PEDMOVE_RUN;
+	}
+
+	if (m_nPedState == PED_SEEK_ENTITY) {
+		if (m_pSeekTarget->IsPed()) {
+			if (((CPed*)m_pSeekTarget)->bInVehicle)
+				distanceToCountItDone += 2.0f;
 		}
-		if (buoyancyImpulse.z / m_fMass > GRAVITY * 0.25f * CTimer::GetTimeStep()) {
-			if (speedMult == 0.0f) {
-				speedMult = pow(0.9f, CTimer::GetTimeStep());
+	}
+
+	CVector *nextNode = SeekFollowingPath();
+
+	if (nextNode || seekPosDist >= distanceToCountItDone) {
+		if (bIsRunning && nextMove != PEDMOVE_SPRINT)
+			nextMove = PEDMOVE_RUN;
+
+		if (CTimer::GetTimeInMilliseconds() <= m_nPedStateTimer) {
+
+			if (m_actionX != 0.0f && m_actionY != 0.0f) {
+
+				m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
+					m_actionX, m_actionY,
+					GetPosition().x, GetPosition().y);
+
+				float neededTurn = Abs(m_fRotationDest - m_fRotationCur);
+
+				if (neededTurn > PI)
+					neededTurn = TWOPI - neededTurn;
+
+				if (neededTurn > HALFPI) {
+					if (seekPosDist >= 1.0f) {
+						if (seekPosDist < 2.0f) {
+							if (bIsRunning)
+								nextMove = PEDMOVE_RUN;
+							else
+								nextMove = PEDMOVE_WALK;
+						}
+					} else {
+						nextMove = PEDMOVE_STILL;
+					}
+				}
+
+				CVector2D moveDist(GetPosition().x - m_actionX, GetPosition().y - m_actionY);
+				if (moveDist.Magnitude() < 0.5f) {
+					m_nPedStateTimer = 0;
+					m_actionX = 0.f;
+					m_actionY = 0.f;
+				}
 			}
-			m_vecMoveSpeed.x *= speedMult;
-			m_vecMoveSpeed.y *= speedMult;
-			if (m_vecMoveSpeed.z >= -0.1f) {
-				if (m_vecMoveSpeed.z < -0.04f)
-					m_vecMoveSpeed.z = -0.02f;
-			} else {
-				m_vecMoveSpeed.z = -0.01f;
-				DMAudio.PlayOneShot(m_audioEntityId, SOUND_SPLASH, 0.0f);
-				CVector aBitForward = 2.2f * m_vecMoveSpeed + GetPosition();
-				float level = 0.0f;
-				if (CWaterLevel::GetWaterLevel(aBitForward, &level, false))
-					aBitForward.z = level;
 
-				CParticleObject::AddObject(POBJECT_PED_WATER_SPLASH, aBitForward, CVector(0.0f, 0.0f, 0.1f), 0.0f, 200, color, true);
-				nGenerateRaindrops = CTimer::GetTimeInMilliseconds() + 80;
-				nGenerateWaterCircles = CTimer::GetTimeInMilliseconds() + 100;
+		} else {
+			if (nextNode) {
+				m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
+					nextNode->x, nextNode->y,
+					GetPosition().x, GetPosition().y);
+			} else {
+				m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
+					m_vecSeekPos.x, m_vecSeekPos.y,
+					GetPosition().x, GetPosition().y);
 			}
-		}
-		if (nGenerateWaterCircles && CTimer::GetTimeInMilliseconds() >= nGenerateWaterCircles) {
-			CVector pos = GetPosition();
-			float level = 0.0f;
-			if (CWaterLevel::GetWaterLevel(pos, &level, false))
-				pos.z = level;
 
-			if (pos.z != 0.0f) {
-				nGenerateWaterCircles = 0;
-				for(int i = 0; i < 4; i++) {
-					pos.x += CGeneral::GetRandomNumberInRange(-0.75f, 0.75f);
-					pos.y += CGeneral::GetRandomNumberInRange(-0.75f, 0.75f);
-					CParticle::AddParticle(PARTICLE_RAIN_SPLASH_BIGGROW, pos, CVector(0.0f, 0.0f, 0.0f), nil, 0.0f, color, 0, 0, 0, 0);
+			float neededTurn = Abs(m_fRotationDest - m_fRotationCur);
+
+			if (neededTurn > PI)
+				neededTurn = TWOPI - neededTurn;
+
+			if (neededTurn > HALFPI) {
+				if (seekPosDist >= 1.0f && neededTurn <= DEGTORAD(135.0f)) {
+					if (seekPosDist < 2.0f)
+						nextMove = PEDMOVE_WALK;
+				} else {
+					nextMove = PEDMOVE_STILL;
 				}
 			}
 		}
-		if (nGenerateRaindrops && CTimer::GetTimeInMilliseconds() >= nGenerateRaindrops) {
-			CVector pos = GetPosition();
-			float level = 0.0f;
-			if (CWaterLevel::GetWaterLevel(pos, &level, false))
-				pos.z = level;
 
-			if (pos.z >= 0.0f) {
-				pos.z += 0.25f;
-				nGenerateRaindrops = 0;
-				CParticleObject::AddObject(POBJECT_SPLASHES_AROUND, pos, CVector(0.0f, 0.0f, 0.0f), 4.5f, 1500, CRGBA(0,0,0,0), true);
-			}
+		if (((m_nPedState == PED_FLEE_POS || m_nPedState == PED_FLEE_ENTITY) && m_nMoveState < nextMove)
+			|| (m_nPedState != PED_FLEE_POS && m_nPedState != PED_FLEE_ENTITY && m_nPedState != PED_FOLLOW_PATH && m_objective != OBJECTIVE_GOTO_CHAR_ON_FOOT && m_nWaitState == WAITSTATE_FALSE)) {
+
+			SetMoveState(nextMove);
 		}
-	} else
-		bTouchingWater = false;
+		
+		SetMoveAnim();
+		return false;
+	}
+
+	if ((m_objective != OBJECTIVE_FOLLOW_CHAR_IN_FORMATION || m_pedInObjective->m_nMoveState == PEDMOVE_STILL) && m_nMoveState != PEDMOVE_STILL) {
+		m_nPedStateTimer = 0;
+		m_actionX = 0.f;
+		m_actionY = 0.f;
+	}
+
+	if (m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA || m_objective == OBJECTIVE_SPRINT_TO_AREA ||
+		m_objective == OBJECTIVE_GOTO_AREA_ANY_MEANS || IsUseAttractorObjective(m_objective)) {
+
+		if (m_pNextPathNode)
+			m_pNextPathNode = nil;
+		else
+			bScriptObjectiveCompleted = true;
+
+		bUsePedNodeSeek = true;
+	}
+
+	return true;
 }
 
 // --MIAMI: Done
 void
-CPed::SetSolicit(uint32 time)
+CPed::SetFlee(CVector2D const &from, int time)
 {
-	if (m_nPedState == PED_SOLICIT || !IsPedInControl() || !m_carInObjective)
+	if (CTimer::GetTimeInMilliseconds() < m_nPedStateTimer || !IsPedInControl() || bKindaStayInSamePlace)
 		return;
 
-	if (CharCreatedBy != MISSION_CHAR && m_carInObjective->m_nNumGettingIn == 0
-		&& CTimer::GetTimeInMilliseconds() < m_objectiveTimer) {
-		if (m_vehEnterType == CAR_DOOR_LF) {
-			m_fRotationDest = m_carInObjective->GetForward().Heading() - HALFPI;
+	if (m_nPedState != PED_FLEE_ENTITY) {
+		SetStoredState();
+		SetPedState(PED_FLEE_POS);
+		SetMoveState(PEDMOVE_RUN);
+		m_fleeFromPos = from;
+	}
+
+	bUsePedNodeSeek = true;
+	m_pNextPathNode = nil;
+	m_fleeTimer = CTimer::GetTimeInMilliseconds() + time;
+
+	float angleToFace = CGeneral::GetRadianAngleBetweenPoints(
+		GetPosition().x, GetPosition().y,
+		from.x, from.y);
+
+	m_fRotationDest = CGeneral::LimitRadianAngle(angleToFace);
+	if (m_fRotationCur - PI > m_fRotationDest) {
+		m_fRotationDest += 2 * PI;
+	} else if (PI + m_fRotationCur < m_fRotationDest) {
+		m_fRotationDest -= 2 * PI;
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::SetFlee(CEntity *fleeFrom, int time)
+{
+	if (!IsPedInControl() || bKindaStayInSamePlace || !fleeFrom)
+		return;
+
+	SetStoredState();
+	SetPedState(PED_FLEE_ENTITY);
+	bUsePedNodeSeek = true;
+	SetMoveState(PEDMOVE_RUN);
+	m_fleeFrom = fleeFrom;
+	m_fleeFrom->RegisterReference((CEntity **) &m_fleeFrom);
+
+	if (time <= 0)
+		m_fleeTimer = 0;
+	else
+		m_fleeTimer = CTimer::GetTimeInMilliseconds() + time;
+
+	float angleToFace = CGeneral::GetRadianAngleBetweenPoints(
+			GetPosition().x, GetPosition().y,
+			fleeFrom->GetPosition().x, fleeFrom->GetPosition().y);
+
+	m_fRotationDest = CGeneral::LimitRadianAngle(angleToFace);
+	if (m_fRotationCur - PI > m_fRotationDest) {
+		m_fRotationDest += 2 * PI;
+	} else if (PI + m_fRotationCur < m_fRotationDest) {
+		m_fRotationDest -= 2 * PI;
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::ClearFlee(void)
+{
+	RestorePreviousState();
+	bUsePedNodeSeek = false;
+	m_standardTimer = 0;
+	m_fleeTimer = 0;
+}
+
+// --MIAMI: Done
+void
+CPed::Flee(void)
+{
+	if (CTimer::GetTimeInMilliseconds() > m_fleeTimer && m_fleeTimer) {
+		bool mayFinishFleeing = true;
+		if (m_nPedState == PED_FLEE_ENTITY) {
+			if ((CVector2D(GetPosition()) - ms_vec2DFleePosition).MagnitudeSqr() < sq(30.0f))
+				mayFinishFleeing = false;
+		}
+
+		if (mayFinishFleeing) {
+			bMakeFleeScream = false;
+			eMoveState moveState = m_nMoveState;
+			ClearFlee();
+
+			if (m_objective == OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE || m_objective == OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS) {
+				bBeingChasedByPolice = false;
+				RestorePreviousObjective();
+			}
+
+			if ((m_nPedState == PED_IDLE || m_nPedState == PED_WANDER_PATH) && CGeneral::GetRandomNumber() & 1) {
+				SetWaitState(moveState <= PEDMOVE_WALK ? WAITSTATE_CROSS_ROAD_LOOK : WAITSTATE_FINISH_FLEE, nil);
+			}
+			return;
+		}
+		m_fleeTimer = CTimer::GetTimeInMilliseconds() + 5000;
+	}
+
+	if (bMakeFleeScream && !((CTimer::GetFrameCounter() + m_randomSeed) & 7)) {
+		Say(SOUND_PED_FLEE_SPRINT);
+		bMakeFleeScream = false;
+	}
+
+	if (bUsePedNodeSeek) {
+		CPathNode *realLastNode = nil;
+		uint8 nextDirection = 0;
+		uint8 curDirectionShouldBe = 9; // means not defined yet
+
+		if (m_nPedStateTimer < CTimer::GetTimeInMilliseconds()
+			&& m_collidingThingTimer < CTimer::GetTimeInMilliseconds()) {
+
+			if (m_pNextPathNode && CTimer::GetTimeInMilliseconds() > m_standardTimer)  {
+
+				curDirectionShouldBe = CGeneral::GetNodeHeadingFromVector(GetPosition().x - ms_vec2DFleePosition.x, GetPosition().y - ms_vec2DFleePosition.y);
+				if (m_nPathDir < curDirectionShouldBe)
+					m_nPathDir += 8;
+
+				int dirDiff = m_nPathDir - curDirectionShouldBe;
+				if (dirDiff > 2 && dirDiff < 6) {
+					realLastNode = nil;
+					m_pLastPathNode = m_pNextPathNode;
+					m_pNextPathNode = nil;
+				}
+			}
+
+			if (m_pNextPathNode) {
+				m_vecSeekPos = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
+				if (m_nMoveState == PEDMOVE_RUN)
+					bIsRunning = true;
+
+				eMoveState moveState = m_nMoveState;
+				if (Seek()) {
+					realLastNode = m_pLastPathNode;
+					m_pLastPathNode = m_pNextPathNode;
+					m_pNextPathNode = nil;
+				}
+				bIsRunning = false;
+				SetMoveState(moveState);
+			}
+		}
+
+		if (!m_pNextPathNode) {
+			if (curDirectionShouldBe == 9) {
+				curDirectionShouldBe = CGeneral::GetNodeHeadingFromVector(GetPosition().x - ms_vec2DFleePosition.x, GetPosition().y - ms_vec2DFleePosition.y);
+			}
+			ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode,
+				curDirectionShouldBe,
+				&nextDirection);
+
+			if (curDirectionShouldBe < nextDirection)
+				curDirectionShouldBe += 8;
+			
+			if (m_pNextPathNode && m_pNextPathNode != realLastNode && m_pNextPathNode != m_pLastPathNode && curDirectionShouldBe - nextDirection != 4) {
+				m_nPathDir = nextDirection;
+				m_standardTimer = CTimer::GetTimeInMilliseconds() + 2000;
+			} else {
+				bUsePedNodeSeek = false;
+				SetMoveState(PEDMOVE_RUN);
+				Flee();
+			}
+		}
+		return;
+	}
+
+	if ((m_nPedState == PED_FLEE_ENTITY || m_nPedState == PED_ON_FIRE) && m_nPedStateTimer < CTimer::GetTimeInMilliseconds()) {
+
+		float angleToFleeFromPos = CGeneral::GetRadianAngleBetweenPoints(
+			GetPosition().x,
+			GetPosition().y,
+			ms_vec2DFleePosition.x,
+			ms_vec2DFleePosition.y);
+
+		m_fRotationDest = CGeneral::LimitRadianAngle(angleToFleeFromPos);
+
+		if (m_fRotationCur - PI > m_fRotationDest)
+			m_fRotationDest += TWOPI;
+		else if (PI + m_fRotationCur < m_fRotationDest)
+			m_fRotationDest -= TWOPI;
+	}
+
+	if (CTimer::GetTimeInMilliseconds() >= m_collidingThingTimer)
+		return;
+
+	if (!m_collidingEntityWhileFleeing)
+		return;
+
+	double collidingThingPriorityMult = (double)(m_collidingThingTimer - CTimer::GetTimeInMilliseconds()) * 2.0 / 2500;
+
+	if (collidingThingPriorityMult <= 1.5) {
+		double angleToFleeEntity = CGeneral::GetRadianAngleBetweenPoints(
+			GetPosition().x,
+			GetPosition().y,
+			m_collidingEntityWhileFleeing->GetPosition().x,
+			m_collidingEntityWhileFleeing->GetPosition().y);
+		angleToFleeEntity = CGeneral::LimitRadianAngle(angleToFleeEntity);
+
+		double angleToFleeCollidingThing = CGeneral::GetRadianAngleBetweenPoints(
+			m_vecDamageNormal.x,
+			m_vecDamageNormal.y,
+			0.0f,
+			0.0f);
+		angleToFleeCollidingThing = CGeneral::LimitRadianAngle(angleToFleeCollidingThing);
+
+		if (angleToFleeEntity - PI > angleToFleeCollidingThing)
+			angleToFleeCollidingThing += TWOPI;
+		else if (PI + angleToFleeEntity < angleToFleeCollidingThing)
+			angleToFleeCollidingThing -= TWOPI;
+
+		if (collidingThingPriorityMult <= 1.0f) {
+			// Range [0.0, 1.0]
+
+			float angleToFleeBoth = (angleToFleeCollidingThing + angleToFleeEntity) * 0.5f;
+
+			if (m_fRotationDest - PI > angleToFleeBoth)
+				angleToFleeBoth += TWOPI;
+			else if (PI + m_fRotationDest < angleToFleeBoth)
+				angleToFleeBoth -= TWOPI;
+	
+			m_fRotationDest = (1.0f - collidingThingPriorityMult) * m_fRotationDest + collidingThingPriorityMult * angleToFleeBoth;
 		} else {
-			m_fRotationDest = m_carInObjective->GetForward().Heading() + HALFPI;
+			// Range (1.0, 1.5]
+
+			double adjustedMult = (collidingThingPriorityMult - 1.0f) * 2.0f;
+			m_fRotationDest = angleToFleeEntity * (1.0 - adjustedMult) + adjustedMult * angleToFleeCollidingThing;
 		}
+	} else {
+		m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
+			m_vecDamageNormal.x,
+			m_vecDamageNormal.y,
+			0.0f,
+			0.0f);
+		m_fRotationDest = CGeneral::LimitRadianAngle(m_fRotationDest);
+	}
 
-		if (Abs(m_fRotationDest - m_fRotationCur) < HALFPI) {
-			m_standardTimer = CTimer::GetTimeInMilliseconds() + time;
+	m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
 
-			if(!m_carInObjective->bIsVan && !m_carInObjective->bIsBus)
-				m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_HOOKERTALK, 4.0f);
+	if (m_fRotationCur - PI > m_fRotationDest)
+		m_fRotationDest += TWOPI;
+	else if (PI + m_fRotationCur < m_fRotationDest)
+		m_fRotationDest -= TWOPI;
 
-			SetPedState(PED_SOLICIT);
+}
+
+// "Wander range" state is unused in game, and you can't use it without SetWanderRange anyway
+void
+CPed::WanderRange(void)
+{
+	bool arrived = Seek();
+	if (arrived) {
+		Idle();
+		if ((m_randomSeed + 3 * CTimer::GetFrameCounter()) % 1000 > 997) {
+			CVector2D newCoords2D = m_wanderRangeBounds->GetRandomPointInRange();
+			SetSeek(CVector(newCoords2D.x, newCoords2D.y, GetPosition().z), 2.5f);
 		}
 	}
 }
 
 // --MIAMI: Done
 bool
-CPed::SetFollowPathStatic(void)
+CPed::SetWanderPath(int8 pathStateDest)
 {
-	ClearFollowPath();
-	if (sq(m_followPathAbortDist) > (GetPosition() - m_followPathDestPos).MagnitudeSqr()
-		&& CWorld::IsWanderPathClear(GetPosition(), m_followPathDestPos, 0.5f, 4)) {
+	uint8 nextPathState;
 
-		RestorePreviousState();
-		if (m_objective == OBJECTIVE_NONE) {
-			if (m_followPathMoveState == PEDMOVE_RUN)
-				SetObjective(OBJECTIVE_RUN_TO_AREA, m_followPathDestPos);
-			else
-				SetObjective(OBJECTIVE_GOTO_AREA_ON_FOOT, m_followPathDestPos);			
+	if (IsPlayer())
+		return false;
+
+	if (IsPedInControl()) {
+		if (bKindaStayInSamePlace) {
+			SetIdle();
+			return false;
+		} else {
+			m_nPathDir = pathStateDest;
+			if (pathStateDest == 0)
+				pathStateDest = CGeneral::GetRandomNumberInRange(1, 7);
+
+			ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode,
+				m_nPathDir, &nextPathState);
+
+			// Circular loop until we find a node for current m_nPathDir
+			while (!m_pNextPathNode) {
+				m_nPathDir = (m_nPathDir+1) % 8;
+
+				// We're at where we started and couldn't find any node
+				if (m_nPathDir == pathStateDest) {
+					ClearAll();
+					SetIdle();
+					return false;
+				}
+				ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode,
+					m_nPathDir, &nextPathState);
+			}
+
+			// We did it, save next path state and return true
+			m_nPathDir = nextPathState;
+			SetPedState(PED_WANDER_PATH);
+			SetMoveState(PEDMOVE_WALK);
+			bIsRunning = false;
+			return true;
 		}
-		SetPedState(PED_NONE);
 	} else {
-		ThePaths.DoPathSearch(PATH_PED, GetPosition(), -1, m_followPathDestPos, m_pathNodesToGo, &m_nNumPathNodes,
-			ARRAY_SIZE(m_pathNodesToGo), nil, nil, 999999.9f, -1);
+		m_nPathDir = pathStateDest;
+		bStartWanderPathOnFoot = true;
+		return false;
+	}
+}
 
-		if (m_nNumPathNodes != 0) {
-			if (m_nNumPathNodes > 0 && m_pathNodesToGo[0] != m_pCurPathNode) {
-				for (int i = 0; i < ARRAY_SIZE(m_pathNodesToGo) - 1; i++) {
-					m_pathNodesToGo[i] = m_pathNodesToGo[i+1];
+// --MIAMI: Done
+void
+CPed::WanderPath(void)
+{
+	if (!m_pNextPathNode) {
+		printf("THIS SHOULDN@T HAPPEN TOO OFTEN\n");
+		SetIdle();
+		return;
+	}
+	if (m_nWaitState == WAITSTATE_FALSE) {
+		if (m_nMoveState == PEDMOVE_STILL || m_nMoveState == PEDMOVE_NONE)
+			SetMoveState(PEDMOVE_WALK);
+	}
+	m_vecSeekPos = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
+	m_vecSeekPos.z += 1.0f;
+
+	// Only returns true when ped is stuck(not stopped) I think, then we should assign new direction or wait state to him.
+	if (!Seek())
+		return;
+
+	CPathNode *previousLastNode = m_pLastPathNode;
+	uint8 randVal = (m_randomSeed + 3 * CTimer::GetFrameCounter()) % 100;
+
+	// We don't prefer 180-degree turns in normal situations
+	uint8 dirWeWouldntPrefer = m_nPathDir;
+	if (dirWeWouldntPrefer <= 3)
+		dirWeWouldntPrefer += 4;
+	else
+		dirWeWouldntPrefer -= 4;
+
+	CPathNode *nodeWeWouldntPrefer = nil;
+	uint8 dirToSet = 9; // means undefined
+	uint8 dirWeWouldntPrefer2 = 9; // means undefined
+	uint8 tryCount = 0;
+
+	if (randVal <= 90) {
+		if (randVal > 80) {
+			m_nPathDir += 2;
+			m_nPathDir %= 8;
+		}
+	} else {
+		m_nPathDir -= 2;
+		if (m_nPathDir < 0)
+			m_nPathDir += 8;
+	}
+
+	m_pLastPathNode = m_pNextPathNode;
+	ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode,
+		m_nPathDir, &dirToSet);
+
+	if (((CPedModelInfo*)CModelInfo::GetModelInfo(m_modelIndex))->m_pedStatType == PEDSTAT_SKATER) {
+		if (m_pNextPathNode) {
+			CVector unpacked(m_pNextPathNode->GetPosition() / 8.f);
+			if (!CPopulation::IsSkateable(unpacked))
+				m_pNextPathNode = nil;
+		}
+	}
+
+	// NB: SetWanderPath checks for m_nPathDir == dirToStartWith, this one checks for tryCount > 7
+	while (!m_pNextPathNode) {
+		tryCount++;
+		m_nPathDir = (m_nPathDir + 1) % 8;
+
+		// We're at where we started and couldn't find any node
+		if (tryCount > 7) {
+			if (!nodeWeWouldntPrefer) {
+				ClearAll();
+				SetIdle();
+				// Probably this text carried over here after copy-pasting this loop from early version of SetWanderPath.
+				Error("Can't find valid path node, SetWanderPath, Ped.cpp");
+				return;
+			}
+			m_pNextPathNode = nodeWeWouldntPrefer;
+			dirToSet = dirWeWouldntPrefer2;
+		} else {
+			ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode,
+				m_nPathDir, &dirToSet);
+			if (m_pNextPathNode) {
+				if (dirToSet == dirWeWouldntPrefer) {
+					nodeWeWouldntPrefer = m_pNextPathNode;
+					dirWeWouldntPrefer2 = dirToSet;
+					m_pNextPathNode = nil;
 				}
-				--m_nNumPathNodes;
 			}
-			for (int i = 0; i < m_nNumPathNodes; ++i) {
-				CVector nodePos = m_pathNodesToGo[i]->GetPosition();
-				if (sq(m_followPathAbortDist) > (nodePos - m_followPathDestPos).MagnitudeSqr()
-					&& CWorld::IsWanderPathClear(nodePos, m_followPathDestPos, 0.5f, 4)) {
-
-					m_nNumPathNodes = i + 1;
-					break;
+			if (((CPedModelInfo*)CModelInfo::GetModelInfo(m_modelIndex))->m_pedStatType == PEDSTAT_SKATER) {
+				if (m_pNextPathNode) {
+					CVector unpacked(m_pNextPathNode->GetPosition() / 8.f);
+					if (!CPopulation::IsSkateable(unpacked))
+						m_pNextPathNode = nil;
 				}
 			}
+		}
+	}
 
-			m_nCurPathNodeId = 0;
-			if (m_pCurPathNode) {
-				for (int j = 0; j < m_nNumPathNodes; ++j) {
-					if (m_pathNodesToGo[j] == m_pCurPathNode) {
-						m_nCurPathNodeId = j;
-						break;
+	m_nPathDir = dirToSet;
+	if (m_pLastPathNode == m_pNextPathNode) {
+		m_pNextPathNode = previousLastNode;
+		SetWaitState(WAITSTATE_DOUBLEBACK, nil);
+		Say(SOUND_PED_WAIT_DOUBLEBACK);
+	} else if (ThePaths.TestForPedTrafficLight(m_pLastPathNode, m_pNextPathNode)) {
+		SetWaitState(WAITSTATE_TRAFFIC_LIGHTS, nil);
+	} else if (ThePaths.TestCrossesRoad(m_pLastPathNode, m_pNextPathNode)) {
+		SetWaitState(WAITSTATE_CROSS_ROAD, nil);
+	} else if (m_pNextPathNode == previousLastNode) {
+		SetWaitState(WAITSTATE_DOUBLEBACK, nil);
+		Say(SOUND_PED_WAIT_DOUBLEBACK);
+	}
+}
+// --MIAMI: Done
+void
+CPed::Avoid(void)
+{
+	CPed *nearestPed;
+
+	if(m_pedStats->m_temper > m_pedStats->m_fear && m_pedStats->m_temper > 50)
+		return;
+
+	if (CTimer::GetTimeInMilliseconds() > m_nPedStateTimer) {
+
+		if (m_nMoveState != PEDMOVE_NONE && m_nMoveState != PEDMOVE_STILL) {
+			nearestPed = m_nearPeds[0];
+
+			if (nearestPed && nearestPed->m_nPedState != PED_DEAD && nearestPed != m_pSeekTarget && nearestPed != m_pedInObjective) {
+
+				// Check if this ped wants to avoid the nearest one
+				if (CPedType::GetAvoid(m_nPedType) & CPedType::GetFlag(nearestPed->m_nPedType)) {
+
+					// Further codes checks whether the distance between us and ped will be equal or below 1.0, if we walk up to him by 1.25 meters.
+					// If so, we want to avoid it, so we turn our body 45 degree and look to somewhere else.
+
+					// Game converts from radians to degress and back again here, doesn't make much sense
+					CVector2D forward(-Sin(m_fRotationCur), Cos(m_fRotationCur));
+					forward.Normalise();	// this is kinda pointless
+
+					// Move forward 1.25 meters
+					CVector2D testPosition = CVector2D(GetPosition()) + forward*1.25f;
+
+					// Get distance to ped we want to avoid
+					CVector2D distToPed = CVector2D(nearestPed->GetPosition()) - testPosition;
+
+					if (distToPed.Magnitude() <= 1.0f && OurPedCanSeeThisOne((CEntity*)nearestPed)) {
+						m_nPedStateTimer = CTimer::GetTimeInMilliseconds()
+							+ 500 + (m_randomSeed + 3 * CTimer::GetFrameCounter())
+							% 1000 / 5;
+
+						m_fRotationDest += DEGTORAD(45.0f);
+						if (!bIsLooking) {
+							SetLookFlag(nearestPed, false);
+							SetLookTimer(CGeneral::GetRandomNumberInRange(500, 800));
+						}
 					}
 				}
 			}
-			m_pCurPathNode = m_pathNodesToGo[m_nCurPathNodeId];
-			PedState oldLastState = m_nLastPedState;
-			m_nLastPedState = PED_NONE;
-			SetStoredState();
-			if (m_nLastPedState == PED_NONE)
-				m_nLastPedState = oldLastState;
-
-			m_nPedState = PED_FOLLOW_PATH;
-			m_nMoveState = m_followPathMoveState;
-		} else {
-			RestorePreviousState();
-			if (m_objective == OBJECTIVE_NONE) {
-				if (m_followPathMoveState == PEDMOVE_RUN)
-					SetObjective(OBJECTIVE_RUN_TO_AREA, m_followPathDestPos);
-				else
-					SetObjective(OBJECTIVE_GOTO_AREA_ON_FOOT, m_followPathDestPos);
-			}
-			SetPedState(PED_NONE);
 		}
 	}
-	return true;
+}
+
+// --MIAMI: Done
+CVector*
+CPed::SeekFollowingPath(void)
+{
+	static CVector vecNextPathNode;
+
+	if (m_nCurPathNodeId >= m_nNumPathNodes || m_nNumPathNodes == 0)
+		return nil;
+
+	vecNextPathNode = m_pathNodesToGo[m_nCurPathNodeId]->GetPosition();
+
+	if ((vecNextPathNode - GetPosition()).Magnitude2D() < m_distanceToCountSeekDone) {
+		m_nCurPathNodeId++;
+		if (m_nCurPathNodeId < m_nNumPathNodes)
+			m_pCurPathNode = m_pathNodesToGo[m_nCurPathNodeId];
+	}
+	if (m_nCurPathNodeId == m_nNumPathNodes)
+		return nil;
+	else
+		return &vecNextPathNode;
 }
 
 // --MIAMI: Done
@@ -17126,6 +6427,75 @@ CPed::SetFollowPath(CVector dest, float radius, eMoveState state, CEntity* walkA
 
 // --MIAMI: Done
 bool
+CPed::SetFollowPathStatic(void)
+{
+	ClearFollowPath();
+	if (sq(m_followPathAbortDist) > (GetPosition() - m_followPathDestPos).MagnitudeSqr()
+		&& CWorld::IsWanderPathClear(GetPosition(), m_followPathDestPos, 0.5f, 4)) {
+
+		RestorePreviousState();
+		if (m_objective == OBJECTIVE_NONE) {
+			if (m_followPathMoveState == PEDMOVE_RUN)
+				SetObjective(OBJECTIVE_RUN_TO_AREA, m_followPathDestPos);
+			else
+				SetObjective(OBJECTIVE_GOTO_AREA_ON_FOOT, m_followPathDestPos);			
+		}
+		SetPedState(PED_NONE);
+	} else {
+		ThePaths.DoPathSearch(PATH_PED, GetPosition(), -1, m_followPathDestPos, m_pathNodesToGo, &m_nNumPathNodes,
+			ARRAY_SIZE(m_pathNodesToGo), nil, nil, 999999.9f, -1);
+
+		if (m_nNumPathNodes != 0) {
+			if (m_nNumPathNodes > 0 && m_pathNodesToGo[0] != m_pCurPathNode) {
+				for (int i = 0; i < ARRAY_SIZE(m_pathNodesToGo) - 1; i++) {
+					m_pathNodesToGo[i] = m_pathNodesToGo[i+1];
+				}
+				--m_nNumPathNodes;
+			}
+			for (int i = 0; i < m_nNumPathNodes; ++i) {
+				CVector nodePos = m_pathNodesToGo[i]->GetPosition();
+				if (sq(m_followPathAbortDist) > (nodePos - m_followPathDestPos).MagnitudeSqr()
+					&& CWorld::IsWanderPathClear(nodePos, m_followPathDestPos, 0.5f, 4)) {
+
+					m_nNumPathNodes = i + 1;
+					break;
+				}
+			}
+
+			m_nCurPathNodeId = 0;
+			if (m_pCurPathNode) {
+				for (int j = 0; j < m_nNumPathNodes; ++j) {
+					if (m_pathNodesToGo[j] == m_pCurPathNode) {
+						m_nCurPathNodeId = j;
+						break;
+					}
+				}
+			}
+			m_pCurPathNode = m_pathNodesToGo[m_nCurPathNodeId];
+			PedState oldLastState = m_nLastPedState;
+			m_nLastPedState = PED_NONE;
+			SetStoredState();
+			if (m_nLastPedState == PED_NONE)
+				m_nLastPedState = oldLastState;
+
+			m_nPedState = PED_FOLLOW_PATH;
+			m_nMoveState = m_followPathMoveState;
+		} else {
+			RestorePreviousState();
+			if (m_objective == OBJECTIVE_NONE) {
+				if (m_followPathMoveState == PEDMOVE_RUN)
+					SetObjective(OBJECTIVE_RUN_TO_AREA, m_followPathDestPos);
+				else
+					SetObjective(OBJECTIVE_GOTO_AREA_ON_FOOT, m_followPathDestPos);
+			}
+			SetPedState(PED_NONE);
+		}
+	}
+	return true;
+}
+
+// --MIAMI: Done
+bool
 CPed::SetFollowPathDynamic(void)
 {
 	CVector colBoxMin = m_followPathWalkAroundEnt->GetColModel()->boundingBox.min + CVector(-0.35f, -0.35f, 0.f);
@@ -17508,664 +6878,678 @@ CPed::SetFollowPathDynamic(void)
 	}
 }
 
+// --MIAMI: Done
 void
-AddYardieDoorSmoke(CVehicle *veh, uint32 doorNode)
+CPed::ClearFollowPath()
 {
-	eDoors door;
-	switch (doorNode) {
-		case CAR_DOOR_RF:
-			door = DOOR_FRONT_RIGHT;
-			break;
-		case CAR_DOOR_LF:
-			door = DOOR_FRONT_LEFT;
-			break;
-		default:
-			break;
-	}
-
-	if (!veh->IsDoorMissing(door) && veh->IsComponentPresent(doorNode)) {
-		CVector pos;
-#ifdef FIX_BUGS
-		veh->GetComponentWorldPosition(doorNode, pos);
-#else
-		veh->GetComponentWorldPosition(CAR_DOOR_LF, pos);
-#endif
-		CParticle::AddYardieDoorSmoke(pos, veh->GetMatrix());
+	for (int i = 0; i < ARRAY_SIZE(m_pathNodesToGo); i++) {
+		m_pathNodesToGo[i] = nil;
 	}
+	m_nNumPathNodes = 0;
+	m_nCurPathNodeId = 0;
 }
 
 // --MIAMI: Done
-// wantedDoorNode = 0 means that func. will determine it
 void
-CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
+CPed::FollowPath(void)
 {
-	uint32 optedDoorNode = wantedDoorNode;
-	bool teleportNeeded = false;
-	bool isLow = !!veh->bLowVehicle;
+	m_pCurPathNode = m_pathNodesToGo[m_nCurPathNodeId];
+	if (m_pathNodeTimer > 0 && CTimer::GetTimeInMilliseconds() > m_pathNodeTimer) {
+		RestorePreviousState();
+		ClearFollowPath();
+		m_pathNodeTimer = 0;
+	} else {
+		if (m_pathNodesToGo[m_nCurPathNodeId]) {
+			m_vecSeekPos.x = m_pathNodesToGo[m_nCurPathNodeId]->GetPosition().x;
+			m_vecSeekPos.y = m_pathNodesToGo[m_nCurPathNodeId]->GetPosition().y;
+			m_vecSeekPos.z = GetPosition().z;
 
-	bool canJumpOut = false;
-	if (!veh->CanPedExitCar(false) && !bBusJacked) {
-		if (IsPlayer()) {
-			canJumpOut = veh->IsBike() ? veh->CanPedJumpOffBike() : veh->CanPedJumpOutCar();
-		}
-		if (!canJumpOut) {
-			if (veh->pDriver) {
-				if (veh->pDriver->IsPlayer()) {
-					if (veh->pDriver != this) {
-						m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 5000;
-						bHeldHostageInCar = true;
-					}
-				} else {
-					veh->AutoPilot.m_nCruiseSpeed = 0;
-					veh->AutoPilot.m_nCarMission = MISSION_NONE;
+			if (Seek()) {
+				if (m_nCurPathNodeId == m_nNumPathNodes) {
+					RestorePreviousState();
+					ClearFollowPath();
+					SetFollowPath(m_followPathDestPos, m_followPathAbortDist, m_followPathMoveState, m_followPathWalkAroundEnt,
+						m_followPathTargetEnt, m_pathNodeTimer - CTimer::GetTimeInMilliseconds());
 				}
 			}
-			return;
+		} else {
+			RestorePreviousState();
+			ClearFollowPath();
+			m_pathNodeTimer = 0;
 		}
 	}
+}
+
+// --MIAMI: Done
+void
+CPed::SetEvasiveStep(CEntity *reason, uint8 animType)
+{
+	AnimationId stepAnim;
 
-	if (m_nPedState == PED_EXIT_CAR || m_nPedState == PED_DRAG_FROM_CAR)
+	if (m_nPedState == PED_STEP_AWAY || !IsPedInControl() || ((IsPlayer() || !bRespondsToThreats) && animType == 0))
 		return;
 
-	m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
-	m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
-	if (wantedDoorNode == 0) {
-		optedDoorNode = CAR_DOOR_LF;
-		if (veh->IsBike()) {
-			if (canJumpOut) {
-				optedDoorNode = veh->pPassengers[0] == this ? CAR_BUMP_REAR : CAR_BOOT;
-			} else if (veh->pPassengers[0] == this) {
-				optedDoorNode = CAR_DOOR_LR;
-			} else {
-				optedDoorNode = CAR_DOOR_LF;
-			}
-		} else if (veh->bIsBus) {
-			optedDoorNode = CAR_DOOR_LF;
-		} else if (veh->pDriver == this) {
-			optedDoorNode = CAR_DOOR_LF;
-		} else if (veh->pPassengers[0] == this) {
-			optedDoorNode = CAR_DOOR_RF;
-		} else if (veh->pPassengers[1] == this) {
-			optedDoorNode = CAR_DOOR_LR;
-		} else if (veh->pPassengers[2] == this) {
-			optedDoorNode = CAR_DOOR_RR;
-		} else {
-			for (int i = 3; i < veh->m_nNumMaxPassengers; ++i) {
-				if (veh->pPassengers[i] == this) {
-					if (i & 1)
-						optedDoorNode = CAR_DOOR_RR;
-					else
-						optedDoorNode = CAR_DOOR_LR;
+	float angleToFace = CGeneral::GetRadianAngleBetweenPoints(
+		reason->GetPosition().x, reason->GetPosition().y,
+		GetPosition().x, GetPosition().y);
+	angleToFace = CGeneral::LimitRadianAngle(angleToFace);
+	m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
+	float neededTurn = Abs(angleToFace - m_fRotationCur);
+	bool vehPressedHorn = false;
 
-					break;
-				}
-			}
+	if (neededTurn > PI)
+		neededTurn = TWOPI - neededTurn;
+
+	CVehicle *veh = (CVehicle*)reason;
+	if (reason->IsVehicle() && veh->IsCar()) {
+		if (veh->m_nCarHornTimer != 0) {
+			vehPressedHorn = true;
+			if (!IsPlayer())
+				animType = 1;
 		}
 	}
-	bool someoneExitsFromOurExitDoor = false;
-	bool someoneEntersFromOurExitDoor = false;
-	if (veh->IsBike()) {
-		switch (optedDoorNode) {
-			case CAR_BUMP_REAR:
-			case CAR_DOOR_RR:
-			case CAR_DOOR_LR:
-				if (veh->m_nGettingInFlags & (CAR_DOOR_FLAG_LR | CAR_DOOR_FLAG_RR))
-					someoneEntersFromOurExitDoor = true;
-				break;
-			case CAR_DOOR_RF:
-			case CAR_DOOR_LF:
-			case CAR_BOOT:
-				if (veh->m_nGettingInFlags & (CAR_DOOR_FLAG_LF | CAR_DOOR_FLAG_RF))
-					someoneEntersFromOurExitDoor = true;
-				break;
-			default:
-				break;
+	if (neededTurn <= DEGTORAD(90.0f) || veh->GetModelIndex() == MI_RCBANDIT || vehPressedHorn || animType != 0) {
+		SetLookFlag(veh, true);
+		if ((CGeneral::GetRandomNumber() & 1) && veh->GetModelIndex() != MI_RCBANDIT && animType == 0) {
+			stepAnim = ANIM_IDLE_TAXI;
+
+		} else {
+			float vehDirection = CGeneral::GetRadianAngleBetweenPoints(
+				veh->m_vecMoveSpeed.x, veh->m_vecMoveSpeed.y,
+				0.0f, 0.0f);
+
+			// Let's turn our back to the "reason"
+			angleToFace += PI;
+
+			if (angleToFace > PI)
+				angleToFace -=  TWOPI;
+
+			// We don't want to run towards car's direction
+			float dangerZone = angleToFace - vehDirection;
+			dangerZone = CGeneral::LimitRadianAngle(dangerZone);
+
+			// So, add or subtract 90deg (jump to left/right) according to that
+			if (dangerZone > 0.0f)
+				angleToFace = vehDirection - HALFPI;
+			else
+				angleToFace = vehDirection + HALFPI;
+
+			stepAnim = NUM_STD_ANIMS;
+			if (animType == 0 || animType == 1)
+				stepAnim = ANIM_EV_STEP;
+			else if (animType == 2)
+				stepAnim = ANIM_HANDSCOWER;
 		}
-	} else {
-		switch (optedDoorNode) {
-			case CAR_DOOR_RF:
-				if (veh->m_nGettingInFlags & CAR_DOOR_FLAG_RF)
-					someoneEntersFromOurExitDoor = true;
-				if (veh->m_nGettingOutFlags & CAR_DOOR_FLAG_RF)
-					someoneExitsFromOurExitDoor = true;
-				break;
-			case CAR_DOOR_RR:
-				if (veh->m_nGettingInFlags & CAR_DOOR_FLAG_RR)
-					someoneEntersFromOurExitDoor = true;
-				if (veh->m_nGettingOutFlags & CAR_DOOR_FLAG_RR)
-					someoneExitsFromOurExitDoor = true;
-				break;
-			case CAR_DOOR_LF:
-				if (veh->m_nGettingInFlags & CAR_DOOR_FLAG_LF)
-					someoneEntersFromOurExitDoor = true;
-				if (veh->m_nGettingOutFlags & CAR_DOOR_FLAG_LF)
-					someoneExitsFromOurExitDoor = true;
-				break;
-			case CAR_DOOR_LR:
-				if (veh->m_nGettingInFlags & CAR_DOOR_FLAG_LR)
-					someoneEntersFromOurExitDoor = true;
-				if (veh->m_nGettingOutFlags & CAR_DOOR_FLAG_LR)
-					someoneExitsFromOurExitDoor = true;
-				break;
-			default:
-				break;
+		if (!RpAnimBlendClumpGetAssociation(GetClump(), stepAnim)) {
+			CAnimBlendAssociation *stepAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, stepAnim, 8.0f);
+			stepAssoc->flags &= ~ASSOC_DELETEFADEDOUT;
+			stepAssoc->SetFinishCallback(PedEvadeCB, this);
+
+			if (animType == 0)
+				Say(SOUND_PED_EVADE);
+
+			m_fRotationCur = CGeneral::LimitRadianAngle(angleToFace);
+			ClearAimFlag();
+			SetStoredState();
+			SetPedState(PED_STEP_AWAY);
 		}
 	}
-	if (someoneEntersFromOurExitDoor && m_objective == OBJECTIVE_LEAVE_CAR) {
-		RestorePreviousObjective();
+}
+
+// --MIAMI: Done
+void
+CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump)
+{
+	if (!IsPedInControl() || !bRespondsToThreats)
 		return;
+
+	CAnimBlendAssociation *animAssoc;
+	float angleToFace, neededTurn;
+	bool handsUp = false;
+
+	angleToFace = m_fRotationCur;
+	CVehicle *veh = (CVehicle*) reason;
+	if (reason->IsVehicle() && veh->m_vehType == VEHICLE_TYPE_CAR && veh->m_nCarHornTimer != 0 && !IsPlayer()) {
+		onlyRandomJump = true;
 	}
-	if (!someoneExitsFromOurExitDoor || m_nPedType == PEDTYPE_COP && veh->bIsBus) {
-#if defined GTAVC_JP_PATCH || defined FIX_BUGS
-		if (veh->pDriver == this && !IsPlayer() && veh == CGameLogic::pShortCutTaxi) {
-			m_objective = OBJECTIVE_NONE;
+
+	if (onlyRandomJump) {
+		if (reason) {
+			// Simple version of my bug fix below. Doesn't calculate "danger zone", selects jump direction randomly.
+			// Also doesn't include random hands up, sound etc. Only used on player ped and peds running from gun shots.
+
+			float vehDirection = CGeneral::GetRadianAngleBetweenPoints(
+				veh->m_vecMoveSpeed.x, veh->m_vecMoveSpeed.y,
+				0.0f, 0.0f);
+			angleToFace = (CGeneral::GetRandomNumber() & 1) * PI + (-0.5f*PI) + vehDirection;
+			angleToFace = CGeneral::LimitRadianAngle(angleToFace);
+		}
+	} else {
+		if (IsPlayer()) {
+			((CPlayerPed*)this)->m_nEvadeAmount = 5;
+			((CPlayerPed*)this)->m_pEvadingFrom = reason;
+			reason->RegisterReference((CEntity**) &((CPlayerPed*)this)->m_pEvadingFrom);
 			return;
 		}
+
+		angleToFace = CGeneral::GetRadianAngleBetweenPoints(
+			reason->GetPosition().x, reason->GetPosition().y,
+			GetPosition().x, GetPosition().y);
+		angleToFace = CGeneral::LimitRadianAngle(angleToFace);
+		m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
+
+		// FIX: Peds no more select dive direction randomly. Taken from SetEvasiveStep, last if statement inverted
+#ifdef FIX_BUGS
+		float vehDirection = CGeneral::GetRadianAngleBetweenPoints(
+			veh->m_vecMoveSpeed.x, veh->m_vecMoveSpeed.y,
+			0.0f, 0.0f);
+
+		// Let's turn our back to the "reason"
+		angleToFace += PI;
+
+		if (angleToFace > PI)
+			angleToFace -= 2 * PI;
+
+		// We don't want to dive towards car's direction
+		float dangerZone = angleToFace - vehDirection;
+		dangerZone = CGeneral::LimitRadianAngle(dangerZone);
+
+		// So, add or subtract 90deg (jump to left/right) according to that
+		if (dangerZone > 0.0f)
+			angleToFace = 0.5f * PI + vehDirection;
+		else
+			angleToFace = vehDirection - 0.5f * PI;
 #endif
-		bool thereIsRoom;
-		if (canJumpOut) {
-			thereIsRoom = 1;
+
+		neededTurn = Abs(angleToFace - m_fRotationCur);
+
+		if (neededTurn > PI)
+			neededTurn = 2 * PI - neededTurn;
+
+		if (neededTurn <= 0.5f*PI) {
+			if (CGeneral::GetRandomNumber() & 1)
+				handsUp = true;
 		} else {
-			// Again, unused...
-			// CVector exitPos = GetPositionToOpenCarDoor(veh, optedDoorNode);
-			thereIsRoom = veh->IsRoomForPedToLeaveCar(optedDoorNode, nil);
+			if (CGeneral::GetRandomNumber() & 7)
+				return;
 		}
 
-		if (!thereIsRoom) {
-			bool trySideSeat = false;
-			CPed *pedOnSideSeat;
-			int firstOptedDoor = optedDoorNode;
-			if (veh->IsBike()) {
-				switch (optedDoorNode) {
-					case CAR_DOOR_RF:
-						optedDoorNode = CAR_DOOR_LF;
-						break;
-					case CAR_DOOR_RR:
-						optedDoorNode = CAR_DOOR_LR;
-						break;
-					case CAR_DOOR_LF:
-						optedDoorNode = CAR_DOOR_RF;
-						break;
-					case CAR_DOOR_LR:
-						optedDoorNode = CAR_DOOR_RR;
-						break;
-					default:
-						break;
-				}
-			} else {
-				switch (optedDoorNode) {
-					case CAR_DOOR_RF:
-						if (veh->pDriver || veh->m_nGettingInFlags & CAR_DOOR_FLAG_LF) {
-							pedOnSideSeat = veh->pDriver;
-							trySideSeat = true;
-						} else
-							optedDoorNode = CAR_DOOR_LF;
+		// VC's primitve solution to dive direction problem, see above for better one. This part doesn't exist on III at all
+#ifndef FIX_BUGS
+		angleToFace += HALFPI;
+		if (CGeneral::GetRandomNumber() & 1)
+			angleToFace -= PI;
+#endif
+		Say(SOUND_PED_EVADE);
+	}
 
-						break;
-					case CAR_DOOR_RR:
-						if (veh->pPassengers[1] || veh->m_nGettingInFlags & CAR_DOOR_FLAG_LR) {
-							pedOnSideSeat = veh->pPassengers[1];
-							trySideSeat = true;
-						} else
-							optedDoorNode = CAR_DOOR_LR;
+	if (handsUp || !IsPlayer() && m_pedStats->m_flags & STAT_NO_DIVE) {
+		m_fRotationCur = angleToFace;
+		ClearLookFlag();
+		ClearAimFlag();
+		SetLookFlag(reason, true);
+		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_HANDSUP);
+		if (animAssoc)
+			return;
 
-						break;
-					case CAR_DOOR_LF:
-						if (veh->pPassengers[0] || veh->m_nGettingInFlags & CAR_DOOR_FLAG_RF) {
-							pedOnSideSeat = veh->pPassengers[0];
-							trySideSeat = true;
-						} else
-							optedDoorNode = CAR_DOOR_RF;
+		animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_HANDSUP, 8.0f);
+		animAssoc->flags &= ~ASSOC_DELETEFADEDOUT;
+		animAssoc->SetFinishCallback(PedEvadeCB, this);
+		SetStoredState();
+		SetPedState(PED_STEP_AWAY);
+	} else {
+		m_fRotationCur = angleToFace;
+		ClearLookFlag();
+		ClearAimFlag();
+		SetStoredState();
+		m_nPedState = PED_DIVE_AWAY;
+		animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_EV_DIVE, 8.0f);
+		animAssoc->SetFinishCallback(PedEvadeCB, this);
+	}
 
-						break;
-					case CAR_DOOR_LR:
-						if (veh->pPassengers[2] || veh->m_nGettingInFlags & CAR_DOOR_FLAG_RR) {
-							pedOnSideSeat = (CPed*)veh->pPassengers[2];
-							trySideSeat = true;
-						} else
-							optedDoorNode = CAR_DOOR_RR;
+	if (reason->IsVehicle() && m_nPedType == PEDTYPE_COP) {
+		if (veh->pDriver && veh->pDriver->IsPlayer()) {
+			CWanted *wanted = FindPlayerPed()->m_pWanted;
+			wanted->RegisterCrime_Immediately(CRIME_RECKLESS_DRIVING, GetPosition(), (uintptr)this, false);
+			wanted->RegisterCrime_Immediately(CRIME_SPEEDING, GetPosition(), (uintptr)this, false);
+		}
+	}
+}
 
-						break;
-					default:
-						break;
-				}
-			}
-			if (trySideSeat) {
-				if (!pedOnSideSeat || !IsPlayer() && CharCreatedBy != MISSION_CHAR)
-					return;
+// --MIAMI: Done
+void
+CPed::PedEvadeCB(CAnimBlendAssociation* animAssoc, void* arg)
+{
+	CPed* ped = (CPed*)arg;
 
-				switch (optedDoorNode) {
-					case CAR_DOOR_RF:
-						optedDoorNode = CAR_DOOR_LF;
-						break;
-					case CAR_DOOR_RR:
-						optedDoorNode = CAR_DOOR_LR;
-						break;
-					case CAR_DOOR_LF:
-						optedDoorNode = CAR_DOOR_RF;
-						break;
-					case CAR_DOOR_LR:
-						optedDoorNode = CAR_DOOR_RR;
-						break;
-					default:
-						break;
-				}
-			}
-			// ...
-			// CVector exitPos = GetPositionToOpenCarDoor(veh, optedDoorNode);
-			if (!veh->IsRoomForPedToLeaveCar(optedDoorNode, nil)) {
-				if (!IsPlayer() && CharCreatedBy != MISSION_CHAR)
-					return;
+	if (!animAssoc) {
+		ped->ClearLookFlag();
+		if (ped->m_nPedState == PED_DIVE_AWAY || ped->m_nPedState == PED_STEP_AWAY)
+			ped->RestorePreviousState();
 
-				// needed for PositionPedOutOfCollision()
-				optedDoorNode = firstOptedDoor;
-				m_vehEnterType = firstOptedDoor;
-				PositionPedOutOfCollision();
-				teleportNeeded = true;
-			}
+	} else if (animAssoc->animId == ANIM_EV_DIVE) {
+		ped->bUpdateAnimHeading = true;
+		ped->ClearLookFlag();
+		if (ped->m_nPedState == PED_DIVE_AWAY) {
+			ped->m_getUpTimer = CTimer::GetTimeInMilliseconds() + 1;
+			ped->SetPedState(PED_FALL);
 		}
+		animAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
+		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
 
-		if (!teleportNeeded && veh->IsOnItsSide()) {
-			m_vehEnterType = optedDoorNode;
-			PositionPedOutOfCollision();
-			teleportNeeded = true;
-		}
+	} else if (animAssoc->flags & ASSOC_FADEOUTWHENDONE) {
+		ped->ClearLookFlag();
+		if (ped->m_nPedState == PED_DIVE_AWAY || ped->m_nPedState == PED_STEP_AWAY)
+			ped->RestorePreviousState();
 
-		if (m_nPedState == PED_FLEE_POS) {
-			m_nLastPedState = PED_FLEE_POS;
-			m_nPrevMoveState = PEDMOVE_RUN;
-			SetMoveState(PEDMOVE_SPRINT);
-		} else {
-			m_nLastPedState = PED_IDLE;
-			m_nPrevMoveState = PEDMOVE_STILL;
-			SetMoveState(PEDMOVE_STILL);
+	} else if (ped->m_nPedState != PED_ARRESTED) {
+		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+		if (animAssoc->blendDelta >= 0.0f)
+			animAssoc->blendDelta = -4.0f;
+
+		ped->ClearLookFlag();
+		if (ped->m_nPedState == PED_DIVE_AWAY || ped->m_nPedState == PED_STEP_AWAY) {
+			ped->RestorePreviousState();
 		}
+	}
+}
 
-		bUsesCollision = false;
-		m_pSeekTarget = veh;
-		m_pSeekTarget->RegisterReference((CEntity**) &m_pSeekTarget);
-		m_vehEnterType = optedDoorNode;
-		SetPedState(PED_EXIT_CAR);
-		if (m_pVehicleAnim && m_pVehicleAnim->flags & ASSOC_PARTIAL)
-			m_pVehicleAnim->blendDelta = -1000.0f;
-		RemoveInCarAnims();
-		SetMoveState(PEDMOVE_NONE);
-		CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 100.0f);
-		veh->AutoPilot.m_nCruiseSpeed = 0;
+// --MIAMI: Done
+void
+CPed::SetDie(AnimationId animId, float delta, float speed)
+{
+	if (m_attractor)
+		GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+	CPlayerPed *player = FindPlayerPed();
+	if (player == this) {
+		if (!player->m_bCanBeDamaged)
+			return;
+	}
 
-		if (teleportNeeded) {
-			PedSetOutCarCB(nil, this);
-		} else {
-			if (veh->GetUp().z <= -0.8f && !veh->IsBike()) {
-				if (m_vehEnterType == CAR_DOOR_RF || m_vehEnterType == CAR_DOOR_RR) {
-					m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_CRAWLOUT_RHS2);
-				} else if (m_vehEnterType == CAR_DOOR_LF || m_vehEnterType == CAR_DOOR_LR) {
-					m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_CRAWLOUT_RHS);
-				}
-				m_pVehicleAnim->SetFinishCallback(PedSetOutCarCB, this);
-
-			} else if (veh->IsBike()) {
-				CBike* bike = (CBike*)veh;
-				switch (m_vehEnterType) {
-					case CAR_BUMP_REAR:
-					case CAR_BOOT:
-						m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_GETOFF_BACK);
-						break;
-					case CAR_DOOR_RF:
-					case CAR_DOOR_RR:
-						m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_GETOFF_LHS);
-						break;
-					case CAR_DOOR_LF:
-					case CAR_DOOR_LR:
-						m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_GETOFF_RHS);
-						break;
-					default:
-						break;
-				}
-				int8 exitFlags = 0;
-
-				// Bike door flags incl. passenger jump off
-				switch (m_vehEnterType) {
-					case CAR_BUMP_REAR:
-					case CAR_DOOR_RR:
-					case CAR_DOOR_LR:
-						exitFlags = CAR_DOOR_FLAG_RR | CAR_DOOR_FLAG_LR;
-						break;
-					case CAR_DOOR_RF:
-					case CAR_DOOR_LF:
-					case CAR_BOOT:
-						exitFlags = CAR_DOOR_FLAG_RF | CAR_DOOR_FLAG_LF;
-						break;
-				}
+	m_threatEntity = nil;
+	if (DyingOrDead())
+		return;
 
-				// Passenger get off
-				if (m_vehEnterType == CAR_BUMP_REAR || m_vehEnterType == CAR_BOOT) {
-					m_pVehicleAnim->SetFinishCallback(RestoreHeadingRateCB, this);
-					m_headingRate = 0.0f;
+	CAnimBlendAssociation *dieAssoc = nil;
+	if (m_nPedState == PED_FALL || m_nPedState == PED_GETUP)
+		delta *=  0.5f;
 
-				} else {
-					veh->m_nGettingOutFlags |= exitFlags;
-					m_pVehicleAnim->SetFinishCallback(PedAnimStepOutCarCB, this);
-				}
+	SetStoredState();
+	ClearAll();
+	m_fHealth = 0.0f;
+	if (m_nPedState == PED_DRIVING) {
+		if (!IsPlayer() && (!m_pMyVehicle || !m_pMyVehicle->IsBike()))
+			FlagToDestroyWhenNextProcessed();
+	} else if (bInVehicle) {
+		if (m_pVehicleAnim)
+			m_pVehicleAnim->blendDelta = -1000.0f;
+	} else if (EnteringCar()) {
+		QuitEnteringCar();
+	}
 
-			} else {
-				switch (m_vehEnterType) {
-					case CAR_DOOR_RF:
-						if (canJumpOut) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_ROLLOUT_RHS);
-						} else if (veh->bIsBus) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_COACH, ANIM_COACH_OUT_L);
-						} else {
-							if (isLow)
-								m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_LOW_RHS);
-							else
-								m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_RHS);
-						}
-						break;
-					case CAR_DOOR_RR:
-						if (canJumpOut) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_ROLLOUT_RHS);
-						} else if (veh->bIsVan) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETOUT);
-						} else if (isLow) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_LOW_RHS);
-						} else {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_RHS);
-						}
-						break;
-					case CAR_DOOR_LF:
-						if (canJumpOut) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_ROLLOUT_LHS);
-						} else if (veh->bIsBus) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_COACH, ANIM_COACH_OUT_L);
-						} else {
-							if (isLow)
-								m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_LOW_LHS);
-							else
-								m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_LHS);
-						}
-						break;
-					case CAR_DOOR_LR:
-						if (canJumpOut) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_ROLLOUT_LHS);
-						} else if (veh->bIsVan) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETOUT_L);
-						} else if (isLow) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_LOW_LHS);
-						} else {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_LHS);
-						}
-						break;
-					default:
-						break;
-				}
-				if (!bBusJacked && !canJumpOut) {
-					veh->m_nGettingOutFlags |= GetCarDoorFlag(m_vehEnterType);
-				}
-				m_pVehicleAnim->SetFinishCallback(canJumpOut ? RestoreHeadingRateCB : PedAnimStepOutCarCB, this);
-			}
+	SetPedState(PED_DIE);
+	if (animId == NUM_STD_ANIMS) {
+		bIsPedDieAnimPlaying = false;
+	} else {
+		dieAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animId, delta);
+		if (speed > 0.0f)
+			dieAssoc->speed = speed;
+
+		dieAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
+		if (dieAssoc->IsRunning()) {
+			dieAssoc->SetFinishCallback(FinishDieAnimCB, this);
+			bIsPedDieAnimPlaying = true;
 		}
-		bChangedSeat = false;
-		if (veh->bIsBus)
-			bRenderPedInCar = true;
+	}
 
-		SetRadioStation();
-		if (veh->pDriver == this) {
-			if (IsPlayer())
-				veh->SetStatus(STATUS_PLAYER_DISABLED);
-			else
-				veh->SetStatus(STATUS_ABANDONED);
+	Say(SOUND_PED_DEATH);
+	if (m_nLastPedState == PED_ENTER_CAR || m_nLastPedState == PED_CARJACK)
+		QuitEnteringCar();
+
+	if (!bInVehicle)
+		StopNonPartialAnims();
+
+	m_bloodyFootprintCountOrDeathTime = CTimer::GetTimeInMilliseconds();
+	if (!CGame::nastyGame && animId == ANIM_FLOOR_HIT) {
+		if (dieAssoc) {
+			dieAssoc->SetCurrentTime(dieAssoc->hierarchy->totalLength - 0.01f);
+			dieAssoc->SetRun();
 		}
 	}
 }
 
 // --MIAMI: Done
 void
-CPed::ScanForInterestingStuff(void)
+CPed::FinishDieAnimCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
-	if (!IsPedInControl())
-		return;
+	CPed *ped = (CPed*)arg;
 
-	if (m_objective != OBJECTIVE_NONE)
-		return;
+	if (ped->bIsPedDieAnimPlaying)
+		ped->bIsPedDieAnimPlaying = false;
+}
 
-	if (CharCreatedBy == MISSION_CHAR)
-		return;
+// --MIAMI: Done
+void
+CPed::SetDead(void)
+{
+	if (!RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DROWN))
+		bUsesCollision = false;
 
-	LookForSexyPeds();
-	LookForSexyCars();
-	if (LookForInterestingNodes())
-		return;
+	m_fHealth = 0.0f;
+	if (m_nPedState == PED_DRIVING)
+		bIsVisible = false;
 
-	if (m_nPedType == PEDTYPE_CRIMINAL && m_hitRecoverTimer < CTimer::GetTimeInMilliseconds()) {
-		if (CGeneral::GetRandomNumber() % 100 < 10) {
-			int mostExpensiveVehAround = -1;
-			int bestMonetaryValue = 0;
+	SetPedState(PED_DEAD);
+	m_pVehicleAnim = nil;
+	m_pCollidingEntity = nil;
 
-			CVector pos = GetPosition();
-			int16 lastVehicle;
-			CEntity *vehicles[8];
-			CWorld::FindObjectsInRange(pos, 10.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
+	CWeaponInfo *weapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
+	RemoveWeaponModel(weapon->m_nModelId);
 
-			for (int i = 0; i < lastVehicle; i++) {
-				CVehicle* veh = (CVehicle*)vehicles[i];
+	m_currentWeapon = WEAPONTYPE_UNARMED;
+	CEventList::RegisterEvent(EVENT_INJURED_PED, EVENT_ENTITY_PED, this, nil, 250);
+	if (this != FindPlayerPed()) {
+		RemoveWeaponAnims(0, -1000.0f);
+		CreateDeadPedWeaponPickups();
+		CreateDeadPedMoney();
+	}
 
-				if (veh->VehicleCreatedBy != MISSION_VEHICLE) {
-					if (veh->m_vecMoveSpeed.Magnitude() <= 0.1f && veh->IsVehicleNormal()
-						&& veh->IsCar() && bestMonetaryValue < veh->pHandling->nMonetaryValue) {
-						mostExpensiveVehAround = i;
-						bestMonetaryValue = veh->pHandling->nMonetaryValue;
-					}
-				}
-			}
-			if (bestMonetaryValue > 2000 && mostExpensiveVehAround != -1 && vehicles[mostExpensiveVehAround]) {
-				SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, vehicles[mostExpensiveVehAround]);
-				m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 5000;
-				return;
-			}
-			m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 5000;
-		} else if (m_objective != OBJECTIVE_MUG_CHAR && !(CGeneral::GetRandomNumber() & 7)) {
-			CPed *charToMug = nil;
-			for (int i = 0; i < m_numNearPeds; ++i) {
-				CPed *nearPed = m_nearPeds[i];
+	m_bloodyFootprintCountOrDeathTime = CTimer::GetTimeInMilliseconds();
+	m_deadBleeding = false;
+	bDoBloodyFootprints = false;
+	bVehExitWillBeInstant = false;
+	CEventList::RegisterEvent(EVENT_DEAD_PED, EVENT_ENTITY_PED, this, nil, 1000);
+}
 
-				if ((nearPed->GetPosition() - GetPosition()).MagnitudeSqr() > sq(7.0f))
-					break;
+// --MIAMI: Done
+void
+CPed::Die(void)
+{
+	// UNUSED: This is a perfectly empty function.
+}
 
-				if ((nearPed->m_nPedType == PEDTYPE_CIVFEMALE || nearPed->m_nPedType == PEDTYPE_CIVMALE
-					|| nearPed->m_nPedType == PEDTYPE_CRIMINAL || nearPed->m_nPedType == PEDTYPE_UNUSED1
-					|| nearPed->m_nPedType == PEDTYPE_PROSTITUTE)
-					&& nearPed->CharCreatedBy != MISSION_CHAR
-					&& nearPed->IsPedShootable()
-					&& nearPed->m_objective != OBJECTIVE_MUG_CHAR) {
-					charToMug = nearPed;
-					break;
-				}
-			}
-			if (charToMug)
-				SetObjective(OBJECTIVE_MUG_CHAR, charToMug);
+// --MIAMI: Done
+void
+CPed::SetChat(CEntity *chatWith, uint32 time)
+{
+	if (m_nPedState != PED_CHAT) {
+		m_nLastPedState = PED_NONE;
+		SetStoredState();
+	}
 
-			m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 5000;
-		}
+	SetPedState(PED_CHAT);
+	SetMoveState(PEDMOVE_STILL);
+	m_lookTimer = 0;
+	SetLookFlag(chatWith, true);
+	m_standardTimer = CTimer::GetTimeInMilliseconds() + time;
+	m_lookTimer = CTimer::GetTimeInMilliseconds() + 3000;
+}
+
+// --MIAMI: Done
+void
+CPed::Chat(void)
+{
+	// We're already looking to our partner
+	if (bIsLooking && TurnBody())
+		ClearLookFlag();
+
+	if (!m_pLookTarget || !m_pLookTarget->IsPed()) {
+		ClearChat();
+		return;
 	}
 
-	if (m_nPedState == PED_WANDER_PATH) {
-		if (CGeneral::GetRandomNumberInRange(0.0f, 1.0f) < 0.5f) {
-			if (CTimer::GetTimeInMilliseconds() > m_standardTimer) {
-				for (int i = 0; i < m_numNearPeds; i ++) {
-					if (m_nearPeds[i] && m_nearPeds[i]->m_nPedState == PED_WANDER_PATH) {
-						if ((GetPosition() - m_nearPeds[i]->GetPosition()).Magnitude() < 1.8f
-							&& CanSeeEntity(m_nearPeds[i])
-							&& m_nearPeds[i]->CanSeeEntity(this)
-							&& WillChat(m_nearPeds[i])) {
+	CPed *partner = (CPed*) m_pLookTarget;
 
-							int time = CGeneral::GetRandomNumber() % 4000 + 10000;
-							SetChat(m_nearPeds[i], time);
-							m_nearPeds[i]->SetChat(this, time);
-						}
-					}
-				}
+	if (partner->m_nPedState != PED_CHAT) {
+		ClearChat();
+		m_standardTimer = CTimer::GetTimeInMilliseconds() + 30000;
+		if (partner->m_pedInObjective) {
+			if (partner->m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT ||
+				partner->m_objective == OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE)
+				ReactToAttack(partner->m_pedInObjective);
+		}
+		return;
+	}
+	if (bIsTalking) {
+		if (CGeneral::GetRandomNumber() < 512) {
+			CAnimBlendAssociation *chatAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_CHAT);
+			if (chatAssoc) {
+				chatAssoc->blendDelta = -4.0f;
+				chatAssoc->flags |= ASSOC_DELETEFADEDOUT;
 			}
-		} else {
-			m_standardTimer = CTimer::GetTimeInMilliseconds() + 200;
+			bIsTalking = false;
+		} else
+			Say(SOUND_PED_CHAT);
+
+	} else {
+
+		if (CGeneral::GetRandomNumber() < 20 && !RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_IDLE)) {
+			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_XPRESS_SCRATCH, 4.0f);
 		}
+		if (!bIsTalking && !RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_IDLE)) {
+			CAnimBlendAssociation *chatAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_CHAT, 4.0f);
+			float chatTime = CGeneral::GetRandomNumberInRange(0.0f, 3.0f);
+			chatAssoc->SetCurrentTime(chatTime);
+
+			bIsTalking = true;
+			Say(SOUND_PED_CHAT);
+		}
+	}
+	if (m_standardTimer && CTimer::GetTimeInMilliseconds() > m_standardTimer) {
+		ClearChat();
+		m_standardTimer = CTimer::GetTimeInMilliseconds() + 30000;
 	}
 }
 
 // --MIAMI: Done
-uint32
-CPed::ScanForThreats(void)
+void
+CPed::ClearChat(void)
 {
-	int fearFlags = m_fearFlags;
-	CVector ourPos = GetPosition();
-	float closestPedDist = 60.0f;
-	CVector2D explosionPos = GetPosition();
-	if (fearFlags & PED_FLAG_EXPLOSION && CheckForExplosions(explosionPos)) {
-		m_eventOrThreat = explosionPos;
-		return PED_FLAG_EXPLOSION;
+	CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_CHAT);
+	if (animAssoc) {
+		animAssoc->blendDelta = -8.0f;
+		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
 	}
-	
-	if (fearFlags & PED_FLAG_GUN) {
-		CPed *shooter = CheckForGunShots();
-		if (shooter && (m_nPedType != shooter->m_nPedType || m_nPedType == PEDTYPE_CIVMALE || m_nPedType == PEDTYPE_CIVFEMALE)) {
-			if (!IsGangMember()) {
-				m_threatEntity = shooter;
-				m_threatEntity->RegisterReference((CEntity**)&m_threatEntity);
-				return PED_FLAG_GUN;
-			}
+	bIsTalking = false;
+	ClearLookFlag();
+	RestorePreviousState();
+	if (m_objective == OBJECTIVE_BUY_ICE_CREAM) {
+		bBoughtIceCream = true;
+		SetObjective(OBJECTIVE_NONE);
+		SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
+	}
+}
 
-			if (CPedType::GetFlag(shooter->m_nPedType) & fearFlags || m_nPedType == PEDTYPE_GANG5) {
-				if (m_threatEntity)
-					m_threatEntity->CleanUpOldReference(&m_threatEntity);
-				m_threatEntity = shooter;
-				m_threatEntity->RegisterReference((CEntity**)&m_threatEntity);
-				return CPedType::GetFlag(shooter->m_nPedType);
-			}
-		}
+// --MIAMI: Done
+bool
+CPed::FacePhone(void)
+{
+	// FIX: This function was broken since it's left unused early in development.
+#ifdef FIX_BUGS
+	float phoneDir = CGeneral::GetRadianAngleBetweenPoints(
+		gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.x, gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.y,
+		GetPosition().x, GetPosition().y);
+
+	SetLookFlag(phoneDir, false);
+	bool turnDone = TurnBody();
+	if (turnDone) {
+		SetIdle();
+		ClearLookFlag();
+		m_phoneTalkTimer = CTimer::GetTimeInMilliseconds() + 10000;
 	}
+	return turnDone;
+#else
+	float currentRot = RADTODEG(m_fRotationCur);
+	float phoneDir = CGeneral::GetRadianAngleBetweenPoints(
+		gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.x,
+		gPhoneInfo.m_aPhones[m_phoneId].m_vecPos.y,
+		GetPosition().x,
+		GetPosition().y);
 
-	CPed *deadPed = nil;
-	if (fearFlags & PED_FLAG_DEADPEDS && CharCreatedBy != MISSION_CHAR
-		&& (deadPed = CheckForDeadPeds()) != nil && (deadPed->GetPosition() - ourPos).MagnitudeSqr() < sq(20.0f)) {
-		m_pEventEntity = deadPed;
-		m_pEventEntity->RegisterReference((CEntity **) &m_pEventEntity);
-		return PED_FLAG_DEADPEDS;
+	SetLookFlag(phoneDir, false);
+	phoneDir = CGeneral::LimitAngle(phoneDir);
+	m_moved = CVector2D(0.0f, 0.0f);
+
+	if (currentRot - 180.0f > phoneDir)
+		phoneDir += 2 * 180.0f;
+	else if (180.0f + currentRot < phoneDir)
+		phoneDir -= 2 * 180.0f;
+
+	float neededTurn = currentRot - phoneDir;
+
+	if (Abs(neededTurn) <= 0.75f) {
+		SetIdle();
+		ClearLookFlag();
+		m_phoneTalkTimer = CTimer::GetTimeInMilliseconds() + 10000;
+		return true;
 	} else {
-		uint32 flagsOfSomePed = 0;
+		m_fRotationCur = DEGTORAD(currentRot - neededTurn * 0.2f);
+		return false;
+	}
+#endif
+}
 
-		CPed *pedToFearFrom = nil;
-		bool weSawOurEnemy = false;
-		bool weMaySeeOurEnemy = false;
-		float closestEnemyDist = 60.0f;
-		if ((CTimer::GetFrameCounter() + (uint8)m_randomSeed + 16) & 4) {
+// --MIAMI: Done
+bool
+CPed::MakePhonecall(void)
+{
+	if (CTimer::GetTimeInMilliseconds() <= m_phoneTalkTimer)
+		return false;
 
-			for (int i = 0; i < m_numNearPeds; ++i) {
-				if (CharCreatedBy == RANDOM_CHAR && m_nearPeds[i]->CharCreatedBy == MISSION_CHAR && !m_nearPeds[i]->IsPlayer()) {
-						continue;
-				}
+	SetIdle();
+	gPhoneInfo.m_aPhones[m_phoneId].m_nState = PHONE_STATE_FREE;
+	m_phoneId = -1;
+	return true;
+}
 
-				// BUG: Explained at the same occurence of this bug above. Fixed at the bottom of the function.
-				flagsOfSomePed = CPedType::GetFlag(m_nearPeds[i]->m_nPedType);
+// --MIAMI: Done
+void
+StartTalkingOnMobileCB(CAnimBlendAssociation* assoc, void* arg)
+{
+	CPed* ped = (CPed*)arg;
+	if (ped->m_nPedState == PED_ANSWER_MOBILE)
+		CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_PHONE_TALK, 4.0f);
+}
 
-				if (flagsOfSomePed & fearFlags) {
-					if (m_nearPeds[i]->m_fHealth > 0.0f) {
-						if (OurPedCanSeeThisOne(m_nearPeds[i], !!bIgnoreThreatsBehindObjects)) {
-							if (m_nearPeds[i]->m_nPedState == PED_ATTACK) {
-								if (m_nearPeds[i]->m_pedInObjective == this) {
+// --MIAMI: Done
+void
+FinishTalkingOnMobileCB(CAnimBlendAssociation *assoc, void *arg)
+{
+	CPed *ped = (CPed*)arg;
+	if (ped->m_storedWeapon != WEAPONTYPE_UNIDENTIFIED) {
+		ped->RemoveWeaponModel(MI_MOBILE);
+		ped->SetCurrentWeapon(ped->m_storedWeapon);
+		ped->m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
+	}
+	ped->m_lookTimer = 0;
+}
 
-									float enemyDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
-									if (sq(closestEnemyDist) > enemyDistSqr) {
-										float enemyDist = Sqrt(enemyDistSqr);
-										weSawOurEnemy = true;
-										closestPedDist = enemyDist;
-										closestEnemyDist = enemyDist;
-										pedToFearFrom = m_nearPeds[i];
-									}
-								}
-							} else {
-								float nearPedDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
-								if (sq(closestPedDist) > nearPedDistSqr && !weSawOurEnemy) {
-									closestPedDist = Sqrt(nearPedDistSqr);
-									pedToFearFrom = m_nearPeds[i];
-								}
-							}
-						} else if (!weSawOurEnemy) {
-							CPed *nearPed = m_nearPeds[i];
-							if (nearPed->m_nPedState == PED_ATTACK) {
-								CColPoint foundCol;
-								CEntity *foundEnt;
+// --MIAMI: Done
+void
+CPed::SetAnswerMobile(void)
+{
+	if (m_nPedState != PED_ANSWER_MOBILE && !DyingOrDead()) {
+		SetPedState(PED_ANSWER_MOBILE);
+		RemoveWeaponAnims(GetWeapon()->m_eWeaponType, -4.0f);
+		CAnimBlendAssociation *assoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_PHONE_IN, 4.0f);
+		assoc->SetFinishCallback(StartTalkingOnMobileCB, this);
+		m_lookTimer = INT32_MAX;
+		if (m_storedWeapon == WEAPONTYPE_UNIDENTIFIED)
+			m_storedWeapon = GetWeapon()->m_eWeaponType;
 
-								// We don't see him yet but he's behind a ped, vehicle or object
-								if (!CWorld::ProcessLineOfSight(ourPos, nearPed->GetPosition(), foundCol, foundEnt,
-									true, false, false, !!bIgnoreThreatsBehindObjects, false, false, false)) {
+		RemoveWeaponModel(-1);
+	}
+}
 
-									if (nearPed->m_pedInObjective == this) {
-										float enemyDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
-										if (sq(closestEnemyDist) > enemyDistSqr) {
-											float enemyDist = Sqrt(enemyDistSqr);
-											weMaySeeOurEnemy = true;
-											closestPedDist = enemyDist;
-											closestEnemyDist = enemyDist;
-											pedToFearFrom = m_nearPeds[i];
-										}
-									} else if (!nearPed->GetWeapon()->IsTypeMelee() && !weMaySeeOurEnemy) {
-										float nearPedDistSqr = (m_nearPeds[i]->GetPosition() - ourPos).MagnitudeSqr2D();
-										if (sq(closestPedDist) > nearPedDistSqr) {
-											weMaySeeOurEnemy = true;
-											closestPedDist = Sqrt(nearPedDistSqr);
-											pedToFearFrom = m_nearPeds[i];
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
+// --MIAMI: Done
+void
+CPed::ClearAnswerMobile(void)
+{
+	if (m_nLastPedState == PED_ANSWER_MOBILE)
+		m_nLastPedState = PED_NONE;
 
-		int16 lastVehicle;
-		CEntity* vehicles[8];
-		CWorld::FindObjectsInRange(ourPos, 20.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
-		CVehicle* foundVeh = nil;
-		for (int i = 0; i < lastVehicle; i++) {
-			CVehicle* nearVeh = (CVehicle*)vehicles[i];
+	if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_TALK)) {
+		CAnimBlendAssociation *assoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_PHONE_OUT, 8.0f);
+		assoc->SetFinishCallback(FinishTalkingOnMobileCB, this);
+	} else
+		FinishTalkingOnMobileCB(nil, this);
 
-			CPed *driver = nearVeh->pDriver;
-			if (driver) {
+	if (m_nPedState == PED_ANSWER_MOBILE) {
+		m_nPedState = PED_IDLE;
+		RestorePreviousState();
+		m_pVehicleAnim = nil;
+	}
+}
 
-				// BUG: Same bug as above. Fixed at the bottom of function.
-				flagsOfSomePed = CPedType::GetFlag(driver->m_nPedType);
-				if (CPedType::GetFlag(driver->m_nPedType) & fearFlags) {
+// --MIAMI: Done
+void
+CPed::AnswerMobile(void)
+{
+	if (!IsPedInControl())
+		return;
 
-					if (driver->m_fHealth > 0.0f && OurPedCanSeeThisOne(nearVeh->pDriver)) {
-						// FIX: Taken from VC
-#ifdef FIX_BUGS
-						float driverDistSqr = (driver->GetPosition() - ourPos).MagnitudeSqr2D();
-#else
-						float driverDistSqr = (CVector2D(ourPos) - explosionPos).MagnitudeSqr();
-#endif
-						if (sq(closestPedDist) > driverDistSqr) {
-							closestPedDist = Sqrt(driverDistSqr);
-							pedToFearFrom = nearVeh->pDriver;
-						}
-					}
-				}
+	CAnimBlendAssociation *phoneInAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_IN);
+	CAnimBlendAssociation *phoneOutAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_OUT);
+	CAnimBlendAssociation *phoneTalkAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_TALK);
+	if (phoneInAssoc || phoneTalkAssoc || phoneOutAssoc) {
+		if (phoneInAssoc) {
+			if (phoneInAssoc->currentTime >= 0.85f && !m_pWeaponModel) {
+				CBaseModelInfo *phoneModel = CModelInfo::GetModelInfo(MI_MOBILE);
+				m_pWeaponModel = (RpAtomic*)phoneModel->CreateInstance();
+				phoneModel->AddRef();
+				m_wepModelID = MI_MOBILE;
+
+				// They copied AddWeaponModel and forgot that here
+				// bool unused = IsPlayer();
+			}
+		} else if (phoneOutAssoc) {
+			if (phoneOutAssoc->currentTime >= 0.5f && phoneOutAssoc->currentTime - phoneOutAssoc->timeStep < 0.5f) {
+				RemoveWeaponModel(MI_MOBILE);
+				SetCurrentWeapon(m_storedWeapon);
+				m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
 			}
 		}
-		m_threatEntity = pedToFearFrom;
-		if (m_threatEntity)
-			m_threatEntity->RegisterReference((CEntity **) &m_threatEntity);
+	} else {
+		CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_PHONE_TALK, 4.0f);
+	}
+}
 
-#ifdef FIX_BUGS
-		if (pedToFearFrom)
-			flagsOfSomePed = CPedType::GetFlag(((CPed*)m_threatEntity)->m_nPedType);
-		else
-			flagsOfSomePed = 0;
-#endif
+// --MIAMI: Done
+void
+CPed::Teleport(CVector pos)
+{
+	CWorld::Remove(this);
+	SetPosition(pos);
+	bIsStanding = false;
+	m_nPedStateTimer = 0;
+	m_actionX = 0.0f;
+	m_actionY = 0.0f;
+	m_pDamageEntity = nil;
+	CWorld::Add(this);
+}
+
+// --MIAMI: Done
+void
+CPed::SetSeekCar(CVehicle *car, uint32 doorNode)
+{
+	if (m_nPedState == PED_SEEK_CAR)
+		return;
+
+	if (!CanSetPedState() || m_nPedState == PED_DRIVING)
+		return;
+
+	SetStoredState();
+	m_pSeekTarget = car;
+	m_pSeekTarget->RegisterReference((CEntity**) &m_pSeekTarget);
+	m_carInObjective = car;
+	m_carInObjective->RegisterReference((CEntity**) &m_carInObjective);
+	m_pMyVehicle = car;
+	m_pMyVehicle->RegisterReference((CEntity**) &m_pMyVehicle);
+	// m_pSeekTarget->RegisterReference((CEntity**) &m_pSeekTarget);
+	m_vehEnterType = doorNode;
+	m_distanceToCountSeekDone = 0.5f;
+	SetPedState(PED_SEEK_CAR);
 
-		return flagsOfSomePed;
-	}
 }
 
 // --MIAMI: Done
@@ -18352,478 +7736,141 @@ CPed::SeekCar(void)
 }
 
 // --MIAMI: Done
-void
-CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk)
+bool
+CPed::CheckForExplosions(CVector2D &area)
 {
-	if (m_nPedState == PED_DEAD) {
-		if (CGame::nastyGame) {
-			if (hitLevel == HITLEVEL_GROUND) {
-				CAnimBlendAssociation *floorHitAssoc;
-				if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL)) {
-					floorHitAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FLOOR_HIT_F, 8.0f);
-				} else {
-					floorHitAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, tFightMoves[FIGHTMOVE_HITONFLOOR].animId, 8.0f);
-				}
-				if (floorHitAssoc) {
-					floorHitAssoc->SetCurrentTime(0.0f);
-					floorHitAssoc->SetRun();
-					floorHitAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
-				}
-			}
-			if (CGame::nastyGame) {
-				CVector headPos = GetNodePosition(PED_HEAD);
-				for(int i = 0; i < 4; ++i) {
-					CVector bloodDir(0.0f, 0.0f, 0.1f);
-					CVector bloodPos = headPos - 0.2f * GetForward();
-					CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, bloodDir, nil, 0.0f, 0, 0, 0, 0);
-				}
-			}
-		}
-	} else if (m_nPedState == PED_FALL) {
-		if (hitLevel == HITLEVEL_GROUND && !IsPedHeadAbovePos(-0.3f)) {
-			CAnimBlendAssociation *floorHitAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL) ?
-				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FLOOR_HIT_F, 8.0f) :
-				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FLOOR_HIT, 8.0f);
-			if (floorHitAssoc) {
-				floorHitAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
-				floorHitAssoc->flags |= ASSOC_DELETEFADEDOUT;
-			}
-		}
-	} else if (IsPedInControl()) {
-		if ((IsPlayer() && m_nPedState != PED_FIGHT && ((CPlayerPed*)this)->m_fMoveSpeed > 1.0f)
-			|| (!IsPlayer() && m_objective == OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE)) {
-
-			if (hitLevel != HITLEVEL_HIGH && hitLevel != HITLEVEL_LOW || (IsPlayer() || CGeneral::GetRandomNumber() & 1) && CGeneral::GetRandomNumber() & 7) {
-				if (IsPlayer() || CGeneral::GetRandomNumber() & 1) {
-					AnimationId shotAnim;
-					switch (direction) {
-						case 1:
-							shotAnim = ANIM_SHOT_LEFT_PARTIAL;
-							break;
-						case 2:
-							shotAnim = ANIM_SHOT_BACK_PARTIAL;
-							break;
-						case 3:
-							shotAnim = ANIM_SHOT_RIGHT_PARTIAL;
-							break;
-						default:
-							shotAnim = ANIM_SHOT_FRONT_PARTIAL;
-							break;
-					}
-					CAnimBlendAssociation *shotAssoc = RpAnimBlendClumpGetAssociation(GetClump(), shotAnim);
-					if (!shotAssoc || shotAssoc->blendDelta < 0.0f)
-						shotAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, shotAnim, 8.0f);
-
-					shotAssoc->SetCurrentTime(0.0f);
-					shotAssoc->SetRun();
-					shotAssoc->flags |= ASSOC_FADEOUTWHENDONE;
-				} else {
-					int time = CGeneral::GetRandomNumberInRange(1000, 3000);
-					SetWaitState(WAITSTATE_PLAYANIM_DUCK, &time);
-				}
-			} else {
-				bool fall = true;
-				AnimationId hitAnim;
-				switch (direction) {
-					case 1:
-						hitAnim = ANIM_KO_SPIN_R;
-						break;
-					case 2:
-						if (CGeneral::GetRandomNumber() & 1) {
-							fall = false;
-							hitAnim = ANIM_HIT_BACK;
-						} else	{
-							hitAnim = ANIM_KO_SKID_BACK;
-						}
-						break;
-					case 3:
-						hitAnim = ANIM_KO_SPIN_L;
-						break;
-					default:
-						if (hitLevel == HITLEVEL_LOW) {
-							hitAnim = ANIM_KO_SHOT_STOM;
-						} else if (CGeneral::GetRandomNumber() & 1) {
-							fall = false;
-							hitAnim = ANIM_HIT_WALK;
-						} else if (CGeneral::GetRandomNumber() & 1) {
-							fall = false;
-							hitAnim = ANIM_HIT_HEAD;
-						} else {
-							hitAnim = ANIM_KO_SHOT_FACE;
-						}
-						break;
-				}
-				if (fall) {
-					SetFall(500, hitAnim, false);
-				} else {
-					CAnimBlendAssociation *hitAssoc = RpAnimBlendClumpGetAssociation(GetClump(), hitAnim);
-					if (!hitAssoc || hitAssoc->blendDelta < 0.0f)
-						hitAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, hitAnim, 8.0f);
-
-					hitAssoc->SetCurrentTime(0.0f);
-					hitAssoc->SetRun();
-					hitAssoc->flags |= ASSOC_FADEOUTWHENDONE;
-				}
-			}
-			Say(SOUND_PED_DEFEND);
-		} else {
-			Say(SOUND_PED_DEFEND);
-			switch (hitLevel) {
-				case HITLEVEL_GROUND:
-					m_curFightMove = FIGHTMOVE_HITONFLOOR;
-					break;
-				case HITLEVEL_LOW:
-					if (direction == 2 && (!IsPlayer() || ((CGeneral::GetRandomNumber() & 1) && m_fHealth < 30.0f))) {
-						SetFall(1000, ANIM_KO_SKID_BACK, false);
-						Say(SOUND_PED_DEFEND);
-						return;
-					} else if (direction != 2 && !IsPlayer() && (CGeneral::GetRandomNumber() & 1) && m_fHealth < 30.0f) {
-						SetFall(1000, ANIM_KO_SHOT_STOM, false);
-						Say(SOUND_PED_DEFEND);
-						return;
-					}	
-					m_curFightMove = FIGHTMOVE_HITBODY;
-					break;
-				case HITLEVEL_HIGH:
-					switch (direction) {
-						case 1:
-							m_curFightMove = FIGHTMOVE_HITLEFT;
-							break;
-						case 2:
-							m_curFightMove = FIGHTMOVE_HITBACK;
-							break;
-						case 3:
-							m_curFightMove = FIGHTMOVE_HITRIGHT;
-							break;
-						default:
-							if (unk <= 5)
-								m_curFightMove = FIGHTMOVE_HITHEAD;
-							else
-								m_curFightMove = FIGHTMOVE_HITBIGSTEP;
-							break;
-					}
-					break;
-				default:
-					switch (direction) {
-						case 1:
-							m_curFightMove = FIGHTMOVE_HITLEFT;
-							break;
-						case 2:
-							m_curFightMove = FIGHTMOVE_HITBACK;
-							break;
-						case 3:
-							m_curFightMove = FIGHTMOVE_HITRIGHT;
-							break;
-						default:
-							if (unk <= 5)
-								m_curFightMove = FIGHTMOVE_HITCHEST;
-							else
-								m_curFightMove = FIGHTMOVE_HITBIGSTEP;
-							break;
-					}
-					break;
-			}
-			if (m_nPedState == PED_GETUP && !IsPedHeadAbovePos(0.0f))
-				m_curFightMove = FIGHTMOVE_HITONFLOOR;
-
-			if (m_nPedState == PED_FIGHT) {
-				CAnimBlendAssociation *moveAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, tFightMoves[m_curFightMove].animId, 8.0f);
-				moveAssoc->SetCurrentTime(0.0f);
-				moveAssoc->SetFinishCallback(FinishFightMoveCB, this);
-				if (IsPlayer())
-					moveAssoc->speed = 1.2f;
+	int event = 0;
+	if (CEventList::FindClosestEvent(EVENT_EXPLOSION, GetPosition(), &event)) {
+		area.x = gaEvent[event].posn.x;
+		area.y = gaEvent[event].posn.y;
+		CEntity *actualEntity = nil;
 
-				m_takeAStepAfterAttack = 0;
-				m_fightButtonPressure = 0;
+		switch (gaEvent[event].entityType) {
+			case EVENT_ENTITY_PED:
+				actualEntity = CPools::GetPed(gaEvent[event].entityRef);
+				break;
+			case EVENT_ENTITY_VEHICLE:
+				actualEntity = CPools::GetVehicle(gaEvent[event].entityRef);
+				break;
+			case EVENT_ENTITY_OBJECT:
+				actualEntity = CPools::GetObject(gaEvent[event].entityRef);
+				break;
+			default:
+				break;
+		}
 
-			} else if (IsPlayer() && GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED && GetWeapon()->m_eWeaponType != WEAPONTYPE_BRASSKNUCKLE &&
-					!CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_bFightMode) {
-				CAnimBlendAssociation *moveAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, tFightMoves[m_curFightMove].animId, 4.0f);
-				moveAssoc->SetCurrentTime(0.0f);
-				moveAssoc->speed = 1.2f;
+		if (actualEntity) {
+			m_pEventEntity = actualEntity;
+			m_pEventEntity->RegisterReference((CEntity **) &m_pEventEntity);
+			bGonnaInvestigateEvent = true;
+		} else
+			bGonnaInvestigateEvent = false;
 
-			} else {
-				if (m_nPedState != PED_AIM_GUN && m_nPedState != PED_ATTACK)
-					SetStoredState();
+		CEventList::ClearEvent(event);
+		return true;
+	} else if (CEventList::FindClosestEvent(EVENT_FIRE, GetPosition(), &event)) {
+		area.x = gaEvent[event].posn.x;
+		area.y = gaEvent[event].posn.y;
+		CEventList::ClearEvent(event);
+		bGonnaInvestigateEvent = false;
+		return true;
+	}
 
-				if (m_nWaitState != WAITSTATE_FALSE) {
-					ClearWaitState();
-					RestoreHeadingRate();
-				}
-				SetPedState(PED_FIGHT);
-				m_fightButtonPressure = 0;
-				m_lastFightMove = FIGHTMOVE_IDLE;
-				RpAnimBlendClumpRemoveAssociations(GetClump(), ASSOC_REPEAT);
-				CAnimBlendAssociation *walkStartAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WALK_START);
-				if (walkStartAssoc) {
-					walkStartAssoc->flags |= ASSOC_DELETEFADEDOUT;
-					walkStartAssoc->blendDelta = -1000.0f;
-				}
-				CAnimBlendAssociation *walkStopAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_RUN_STOP);
-				if (!walkStopAssoc)
-					walkStopAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_RUN_STOP_R);
-				if (walkStopAssoc) {
-					walkStopAssoc->flags |= ASSOC_DELETEFADEDOUT;
-					walkStopAssoc->blendDelta = -1000.0f;
-					RestoreHeadingRate();
-				}
-				SetMoveState(PEDMOVE_NONE);
-				m_nStoredMoveState = PEDMOVE_NONE;
-				CAnimBlendAssociation *fightIdleAssoc;
-
-				if (GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED) {
-					CWeaponInfo *weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-					if (GetFightIdleWithMeleeAnim(weaponInfo)) {
-						fightIdleAssoc = CAnimManager::AddAnimation(GetClump(), weaponInfo->m_AnimToPlay, GetFightIdleWithMeleeAnim(weaponInfo));
-					} else {
-						fightIdleAssoc = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT_IDLE);
-					}
-				} else {
-					fightIdleAssoc = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT_IDLE);
-				}
-				fightIdleAssoc->blendAmount = 1.0f;
-				CAnimBlendAssociation *moveAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, tFightMoves[m_curFightMove].animId, 8.0f);
-				moveAssoc->SetFinishCallback(FinishFightMoveCB, this);
-				m_fightState = FIGHTSTATE_NO_MOVE;
-				m_takeAStepAfterAttack = false;
-				bIsAttacking = true;
-			}
+	bGonnaInvestigateEvent = false;
+	return false;
+}
 
-			if (m_pedInObjective && m_pedInObjective->IsPlayer() && !IsPlayer())
-				((CPlayerPed*)m_pedInObjective)->RemovePedFromMeleeList(this);
+// --MIAMI: Done
+CPed *
+CPed::CheckForGunShots(void)
+{
+	int event;
+	if (CEventList::FindClosestEvent(EVENT_GUNSHOT, GetPosition(), &event)) {
+		if (gaEvent[event].entityType == EVENT_ENTITY_PED) {
+			// Probably due to we don't want peds to go gunshot area? (same on VC)
+			bGonnaInvestigateEvent = false;
+			return CPools::GetPed(gaEvent[event].entityRef);
 		}
 	}
+	bGonnaInvestigateEvent = false;
+	return nil;
 }
 
 // --MIAMI: Done
-void
-CPed::UpdateFromLeader(void)
+CPed *
+CPed::CheckForDeadPeds(void)
 {
-	if (CTimer::GetTimeInMilliseconds() <= m_objectiveTimer)
-		return;
-
-	if (!m_leader)
-		return;
-
-	CVector leaderDist;
-	if (m_leader->InVehicle())
-		leaderDist = m_leader->m_pMyVehicle->GetPosition() - GetPosition();
-	else
-		leaderDist = m_leader->GetPosition() - GetPosition();
-
-	if (leaderDist.Magnitude() > 30.0f) {
-		if (bWaitForLeaderToComeCloser) {
-			if (IsPedInControl()) {
-				SetObjective(OBJECTIVE_NONE);
-				SetIdle();
-				SetMoveState(PEDMOVE_STILL);
-			}
-			return;
-		}
-		bWaitForLeaderToComeCloser = true;
-	} else
-		bWaitForLeaderToComeCloser = false;
-
-	if (IsPedInControl()) {
-		if (m_nWaitState == WAITSTATE_PLAYANIM_TAXI)
-			WarpPedToNearLeaderOffScreen();
-
-		if (m_leader->m_nPedState == PED_DEAD) {
-			SetLeader(nil);
-			SetObjective(OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE);
-			return;
-		}
-		if (!m_leader->bInVehicle) {
-			if (m_leader->m_objective != OBJECTIVE_ENTER_CAR_AS_DRIVER) {
-				if (bInVehicle) {
-					if (m_objective != OBJECTIVE_WAIT_IN_CAR_THEN_GET_OUT && m_objective != OBJECTIVE_LEAVE_CAR)
-						SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
-
-					return;
-				}
-				if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER) {
-					RestorePreviousObjective();
-					RestorePreviousState();
-				}
-			}
-			if (m_nPedType == PEDTYPE_PROSTITUTE && CharCreatedBy == RANDOM_CHAR) {
-				SetLeader(nil);
-				return;
-			}
-		}
-		if (!bInVehicle && m_leader->bInVehicle && m_leader->m_nPedState == PED_DRIVING) {
-			if (m_objective != OBJECTIVE_ENTER_CAR_AS_PASSENGER && m_objective != OBJECTIVE_ENTER_CAR_AS_DRIVER) {
-				if (m_leader->m_pMyVehicle->m_nNumPassengers < m_leader->m_pMyVehicle->m_nNumMaxPassengers)
-					SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, m_leader->m_pMyVehicle);
-			}
-		} else if (m_leader->m_objective == OBJECTIVE_NONE || (m_leader->IsPlayer() && m_leader->m_objective == OBJECTIVE_WAIT_ON_FOOT)
-			|| m_objective == m_leader->m_objective) {
-
-			if (m_leader->m_nPedState == PED_ATTACK && !bDontFight) {
-				CEntity *lookTargetOfLeader = m_leader->m_pLookTarget;
-
-				if (lookTargetOfLeader && m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT && lookTargetOfLeader->IsPed() && lookTargetOfLeader != this) {
-					SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, lookTargetOfLeader);
-					SetObjectiveTimer(8000);
-					SetLookFlag(m_leader->m_pLookTarget, false);
-					SetLookTimer(500);
-				}
-			} else {
-				if (IsPedInControl() && m_nPedState != PED_ATTACK) {
-					if (m_leader->m_objective == OBJECTIVE_NONE && m_objective == OBJECTIVE_NONE && m_leader->m_nPedState == PED_CHAT && m_nPedState == PED_CHAT) {
-						SetObjective(OBJECTIVE_NONE);
-					} else {
-						SetObjective(OBJECTIVE_GOTO_CHAR_ON_FOOT, m_leader);
-						SetObjectiveTimer(0);
-					}
-				}
-				if (m_nPedState == PED_IDLE && m_leader->IsPlayer() && !bDontFight) {
-					if (ScanForThreats() && m_threatEntity) {
-						m_pLookTarget = m_threatEntity;
-						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);
-							SetAttack(m_threatEntity);
-						}
-					}
-				}
-			}
-		} else {
-			switch (m_leader->m_objective) {
-				case OBJECTIVE_WAIT_ON_FOOT:
-				case OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE:
-				case OBJECTIVE_WAIT_IN_CAR:
-				case OBJECTIVE_FOLLOW_ROUTE:
-					SetObjective(m_leader->m_objective);
-					m_objectiveTimer = m_leader->m_objectiveTimer;
-					break;
-				case OBJECTIVE_GUARD_SPOT:
-					SetObjective(OBJECTIVE_GUARD_SPOT, m_leader->m_vecSpotToGuard);
-					m_objectiveTimer = m_leader->m_objectiveTimer;
-					break;
-				case OBJECTIVE_KILL_CHAR_ON_FOOT:
-				case OBJECTIVE_KILL_CHAR_ANY_MEANS:
-				case OBJECTIVE_GOTO_CHAR_ON_FOOT:
-				case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
-				case OBJECTIVE_HASSLE_CHAR:
-					if (m_leader->m_pedInObjective) {
-						SetObjective(m_leader->m_objective, m_leader->m_pedInObjective);
-						m_objectiveTimer = m_leader->m_objectiveTimer;
-					}
-					break;
-				case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
-				case OBJECTIVE_ENTER_CAR_AS_DRIVER:
-					if (m_leader->m_carInObjective) {
-						m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 150;
-						SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, m_leader->m_carInObjective);
-						return;
-					}
-					break;
-				case OBJECTIVE_GUARD_ATTACK:
-					return;
-				case OBJECTIVE_HAIL_TAXI:
-					m_leader = nil;
-					SetObjective(OBJECTIVE_NONE);
-					break;
-				default:
-					SetObjective(OBJECTIVE_GOTO_CHAR_ON_FOOT, m_leader);
-					SetObjectiveTimer(0);
-					break;
-			}
-		}
-	} else if (bInVehicle) {
-		if ((!m_leader->bInVehicle || m_leader->m_nPedState == PED_EXIT_CAR) && m_objective != OBJECTIVE_WAIT_IN_CAR_THEN_GET_OUT) {
-
-			switch (m_leader->m_objective) {
-				case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
-				case OBJECTIVE_ENTER_CAR_AS_DRIVER:
-					if (m_pMyVehicle == m_leader->m_pMyVehicle || m_pMyVehicle == m_leader->m_carInObjective)
-						break;
-
-					// fall through
-				default:
-					if (m_pMyVehicle && m_objective != OBJECTIVE_LEAVE_CAR) {
-						m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 250;
-						SetObjective(OBJECTIVE_LEAVE_CAR, m_pMyVehicle);
-					}
-
-					break;
-			}
+	int event;
+	if (CEventList::FindClosestEvent(EVENT_DEAD_PED, GetPosition(), &event)) {
+		int pedHandle = gaEvent[event].entityRef;
+		if (pedHandle && gaEvent[event].entityType == EVENT_ENTITY_PED) {
+			bGonnaInvestigateEvent = true;
+			return CPools::GetPed(pedHandle);
 		}
 	}
+	bGonnaInvestigateEvent = false;
+	return nil;
 }
 
 // --MIAMI: Done
-void
-CPed::UpdatePosition(void)
+bool
+CPed::IsPlayer(void) const
 {
-	if (CReplay::IsPlayingBack() || !bIsStanding || m_attachedTo)
-		return;
-
-	CVector2D velocityChange;
-
-	SetHeading(m_fRotationCur);
-	if (m_pCurrentPhysSurface) {
-		CVector2D velocityOfSurface;
-		if (!IsPlayer() && m_pCurrentPhysSurface->IsVehicle() && ((CVehicle*)m_pCurrentPhysSurface)->IsBoat()) {
+#if 0
+	return m_nPedType == PEDTYPE_PLAYER1; // Original
+#else
+	// We still have those in enum, so let's also check for them.
+	return m_nPedType == PEDTYPE_PLAYER1 || m_nPedType == PEDTYPE_PLAYER2 ||
+		m_nPedType == PEDTYPE_PLAYER3 || m_nPedType == PEDTYPE_PLAYER4;
+#endif
+}
 
-			// It seems R* didn't like m_vecOffsetFromPhysSurface for boats
-			CVector offsetToSurface = GetPosition() - m_pCurrentPhysSurface->GetPosition();
-			offsetToSurface.z -= FEET_OFFSET;
+// --MIAMI: Done
+bool
+CPed::IsGangMember(void) const
+{
+	return m_nPedType >= PEDTYPE_GANG1 && m_nPedType <= PEDTYPE_GANG9;
+}
 
-			CVector surfaceMoveVelocity = m_pCurrentPhysSurface->m_vecMoveSpeed;
-			CVector surfaceTurnVelocity = CrossProduct(m_pCurrentPhysSurface->m_vecTurnSpeed, offsetToSurface);
+// --MIAMI: Done
+bool
+IsPedPointerValid(CPed* pPed)
+{
+	if (!IsPedPointerValid_NotInWorld(pPed))
+		return false;
+	if (pPed->bInVehicle && pPed->m_pMyVehicle)
+		return IsEntityPointerValid(pPed->m_pMyVehicle);
+	return pPed->m_entryInfoList.first || pPed == FindPlayerPed();
+}
 
-			// Also we use that weird formula instead of friction if it's boat
-			float slideMult = -m_pCurrentPhysSurface->m_vecTurnSpeed.MagnitudeSqr();
-			velocityOfSurface = slideMult * offsetToSurface * CTimer::GetTimeStep() + (surfaceTurnVelocity + surfaceMoveVelocity);
-			m_vecMoveSpeed.z = slideMult * offsetToSurface.z * CTimer::GetTimeStep() + (surfaceTurnVelocity.z + surfaceMoveVelocity.z);
-		} else {
-			velocityOfSurface = m_pCurrentPhysSurface->GetSpeed(m_vecOffsetFromPhysSurface);
-		}
-		// Reminder: m_moved is displacement from walking/running.
-		velocityChange = m_moved + velocityOfSurface - m_vecMoveSpeed;
-		m_fRotationCur += m_pCurrentPhysSurface->m_vecTurnSpeed.z * CTimer::GetTimeStep();
-		m_fRotationDest += m_pCurrentPhysSurface->m_vecTurnSpeed.z * CTimer::GetTimeStep();
-	} else if (m_nSurfaceTouched == SURFACE_STEEP_CLIFF && (m_vecDamageNormal.x != 0.0f || m_vecDamageNormal.y != 0.0f)) {
-		// Ped got damaged by steep slope
-		m_vecMoveSpeed = CVector(0.0f, 0.0f, -0.001f);
-		// some kind of
-		CVector2D reactionForce = m_vecDamageNormal;
-		reactionForce.Normalise();
+// --MIAMI: Done
+bool
+IsPedPointerValid_NotInWorld(CPed* pPed)
+{
+	if (!pPed)
+		return false;
+	int index = CPools::GetPedPool()->GetJustIndex(pPed);
+#ifdef FIX_BUGS
+	if (index < 0 || index >= NUMPEDS)
+#else
+	if (index < 0 || index > NUMPEDS)
+#endif
+		return false;
+	return true;
+}
 
-		velocityChange = 0.02f * reactionForce + m_moved;
+// --MIAMI: Done
+bool
+CPed::IsPointerValid(void)
+{
+	int pedIndex = CPools::GetPedPool()->GetIndex(this) >> 8;
+	if (pedIndex < 0 || pedIndex >= NUMPEDS)
+		return false;
 
-		float reactionAndVelocityDotProd = DotProduct2D(reactionForce, velocityChange);
-		// they're in same direction
-		if (reactionAndVelocityDotProd < 0.0f) {
-			velocityChange -= reactionAndVelocityDotProd * reactionForce;
-		}
-	} else {
-		velocityChange = m_moved - m_vecMoveSpeed;
-	}
-	
-	// Take time step into account
-	if (m_pCurrentPhysSurface && (!m_pCurrentPhysSurface->bInfiniteMass || m_pCurrentPhysSurface->m_phy_flagA08)) {
-		float speedChange = velocityChange.Magnitude();
-		float changeMult = speedChange;
-		if (m_nPedState == PED_DIE && m_pCurrentPhysSurface->IsVehicle()) {
-			changeMult = 0.002f * CTimer::GetTimeStep();
-		} else if (!(m_pCurrentPhysSurface->IsVehicle() && ((CVehicle*)m_pCurrentPhysSurface)->IsBoat())) {
-			changeMult = 0.01f * CTimer::GetTimeStep();
-		}
+	if (m_entryInfoList.first || FindPlayerPed() == this)
+		return true;
 
-		if (speedChange > changeMult) {
-			velocityChange = velocityChange * (changeMult / speedChange);
-		}
-	}
-	m_vecMoveSpeed.x += velocityChange.x;
-	m_vecMoveSpeed.y += velocityChange.y;
+	return false;
 }
 
 // --MIAMI: Done
@@ -18919,729 +7966,1101 @@ CPed::SetPedPositionInCar(void)
 	GetMatrix() = newMat;
 }
 
-static RwObject*
-CloneAtomicToFrameCB(RwObject *frame, void *data)
+// --MIAMI: Done
+void
+CPed::LookForSexyPeds(void)
 {
-	RpAtomic *newAtomic = RpAtomicClone((RpAtomic*)frame);
-	RpAtomicSetFrame(newAtomic, (RwFrame*)data);
-	RpClumpAddAtomic(flyingClumpTemp, newAtomic);
-	CVisibilityPlugins::SetAtomicRenderCallback(newAtomic, nil);
-	return frame;
-}
+	if ((!IsPedInControl() && m_nPedState != PED_DRIVING)
+		|| m_lookTimer >= CTimer::GetTimeInMilliseconds() || m_nPedType != PEDTYPE_CIVMALE)
+		return;
 
-static RwFrame*
-RecurseFrameChildrenToCloneCB(RwFrame *frame, void *data)
-{
-	RwFrame *newFrame = RwFrameCreate();
-	RwFrameAddChild((RwFrame*)data, newFrame);
-	RwFrameTransform(newFrame, RwFrameGetMatrix(frame), rwCOMBINEREPLACE);
-	RwFrameForAllObjects(frame, CloneAtomicToFrameCB, newFrame);
-	RwFrameForAllChildren(frame, RecurseFrameChildrenToCloneCB, newFrame);
-	return newFrame;
+	for (int i = 0; i < m_numNearPeds; i++) {
+		if (CanSeeEntity(m_nearPeds[i])) {
+			if ((GetPosition() - m_nearPeds[i]->GetPosition()).Magnitude() < 10.0f) {
+				CPed *nearPed = m_nearPeds[i];
+				if ((nearPed->m_pedStats->m_sexiness > m_pedStats->m_sexiness)
+					&& nearPed->m_nPedType == PEDTYPE_CIVFEMALE) {
+
+					SetLookFlag(nearPed, true);
+					m_lookTimer = CTimer::GetTimeInMilliseconds() + 4000;
+					Say(SOUND_PED_CHAT_SEXY);
+					return;
+				}
+			}
+		}
+	}
+	m_lookTimer = CTimer::GetTimeInMilliseconds() + 10000;
 }
 
 // --MIAMI: Done
-CObject*
-CPed::SpawnFlyingComponent(int pedNode, int8 direction)
+void
+CPed::LookForSexyCars(void)
 {
-	// VC doesn't have detachable limbs :shrug:
-	return nil;
+	CEntity *vehicles[8];
+	CVehicle *veh;
+	int foundVehId = 0;
+	int bestPriceYet = 0;
+	int16 lastVehicle;
+
+	if (!IsPedInControl() && m_nPedState != PED_DRIVING)
+		return;
+
+	if (m_lookTimer < CTimer::GetTimeInMilliseconds()) {
+		CWorld::FindObjectsInRange(GetPosition(), 10.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
+
+		for (int vehId = 0; vehId < lastVehicle; vehId++) {
+			veh = (CVehicle*)vehicles[vehId];
+			if (veh != m_pMyVehicle && bestPriceYet < veh->pHandling->nMonetaryValue) {
+				foundVehId = vehId;
+				bestPriceYet = veh->pHandling->nMonetaryValue;
+			}
+		}
+		if (lastVehicle > 0 && bestPriceYet > 40000)
+			SetLookFlag(vehicles[foundVehId], false);
+
+		m_lookTimer = CTimer::GetTimeInMilliseconds() + 10000;
+	}
 }
 
 // --MIAMI: Done
-void
-CPed::WarpPedIntoCar(CVehicle *car)
+bool
+CPed::LookForInterestingNodes(void)
 {
-	bInVehicle = true;
-	m_pMyVehicle = car;
-	m_pMyVehicle->RegisterReference((CEntity **) &m_pMyVehicle);
-	m_carInObjective = car;
-	m_carInObjective->RegisterReference((CEntity **) &m_carInObjective);
-	SetPedState(PED_DRIVING);
-	bUsesCollision = false;
-	bIsInTheAir = false;
-	bVehExitWillBeInstant = true;
-	if (m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
-		car->SetDriver(this);
-		car->pDriver->RegisterReference((CEntity **) &car->pDriver);
+	CBaseModelInfo *model;
+	CPtrNode *ptrNode;
+	CVector effectDist;
+	C2dEffect *effect;
+	CMatrix *objMat;
 
-	} else if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER) {
-		if (car->IsBike() && !car->pPassengers[0]) {
-			car->pPassengers[0] = this;
-			car->pPassengers[0]->RegisterReference((CEntity**) &car->pPassengers[0]);
-		}
-		for (int i = 0; i < 4; i++) {
-			if (!car->pPassengers[i]) {
-				car->pPassengers[i] = this;
-				car->pPassengers[i]->RegisterReference((CEntity **) &car->pPassengers[i]);
-				break;
+	if ((CTimer::GetFrameCounter() + (m_randomSeed % 256)) & 7 || CTimer::GetTimeInMilliseconds() <= m_standardTimer) {
+		return false;
+	}
+	bool found = false;
+	uint8 randVal = CGeneral::GetRandomNumber() % 256;
+
+	int minX = CWorld::GetSectorIndexX(GetPosition().x - CHECK_NEARBY_THINGS_MAX_DIST);
+	if (minX < 0) minX = 0;
+	int minY = CWorld::GetSectorIndexY(GetPosition().y - CHECK_NEARBY_THINGS_MAX_DIST);
+	if (minY < 0) minY = 0;
+	int maxX = CWorld::GetSectorIndexX(GetPosition().x + CHECK_NEARBY_THINGS_MAX_DIST);
+#ifdef FIX_BUGS
+	if (maxX >= NUMSECTORS_X) maxX = NUMSECTORS_X - 1;
+#else
+	if (maxX >= NUMSECTORS_X) maxX = NUMSECTORS_X;
+#endif
+
+	int maxY = CWorld::GetSectorIndexY(GetPosition().y + CHECK_NEARBY_THINGS_MAX_DIST);
+#ifdef FIX_BUGS
+	if (maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y - 1;
+#else
+	if (maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y;
+#endif
+
+	for (int curY = minY; curY <= maxY && !found; curY++) {
+		for (int curX = minX; curX <= maxX && !found; curX++) {
+			CSector *sector = CWorld::GetSector(curX, curY);
+
+			for (ptrNode = sector->m_lists[ENTITYLIST_VEHICLES].first; ptrNode && !found; ptrNode = ptrNode->next) {
+				CVehicle *veh = (CVehicle*)ptrNode->item;
+				model = veh->GetModelInfo();
+				if (model->GetNum2dEffects() != 0) {
+					for (int e = 0; e < model->GetNum2dEffects(); e++) {
+						effect = model->Get2dEffect(e);
+						if (effect->type == EFFECT_ATTRACTOR && effect->attractor.probability >= randVal) {
+							objMat = &veh->GetMatrix();
+							CVector effectPos = veh->GetMatrix() * effect->pos;
+							effectDist = effectPos - GetPosition();
+							if (effectDist.MagnitudeSqr() < sq(8.0f)) {
+								found = true;
+								break;
+							}
+						}
+					}
+				}
+			}
+			for (ptrNode = sector->m_lists[ENTITYLIST_OBJECTS].first; ptrNode && !found; ptrNode = ptrNode->next) {
+				CObject *obj = (CObject*)ptrNode->item;
+				model = CModelInfo::GetModelInfo(obj->GetModelIndex());
+				if (model->GetNum2dEffects() != 0) {
+					for (int e = 0; e < model->GetNum2dEffects(); e++) {
+						effect = model->Get2dEffect(e);
+						if (effect->type == EFFECT_ATTRACTOR && effect->attractor.probability >= randVal) {
+							objMat = &obj->GetMatrix();
+							CVector effectPos = obj->GetMatrix() * effect->pos;
+							effectDist = effectPos - GetPosition();
+							if (effectDist.MagnitudeSqr() < sq(8.0f)) {
+								found = true;
+								break;
+							}
+						}
+					}
+				}
+			}
+			for (ptrNode = sector->m_lists[ENTITYLIST_BUILDINGS].first; ptrNode && !found; ptrNode = ptrNode->next) {
+				CBuilding *building = (CBuilding*)ptrNode->item;
+				model = CModelInfo::GetModelInfo(building->GetModelIndex());
+				if (model->GetNum2dEffects() != 0) {
+					for (int e = 0; e < model->GetNum2dEffects(); e++) {
+						effect = model->Get2dEffect(e);
+						if (effect->type == EFFECT_ATTRACTOR && effect->attractor.probability >= randVal) {
+							objMat = &building->GetMatrix();
+							CVector effectPos = building->GetMatrix() * effect->pos;
+							effectDist = effectPos - GetPosition();
+							if (effectDist.MagnitudeSqr() < sq(8.0f)) {
+								found = true;
+								break;
+							}
+						}
+					}
+				}
+			}
+			for (ptrNode = sector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP].first; ptrNode && !found; ptrNode = ptrNode->next) {
+				CBuilding *building = (CBuilding*)ptrNode->item;
+				model = CModelInfo::GetModelInfo(building->GetModelIndex());
+				if (model->GetNum2dEffects() != 0) {
+					for (int e = 0; e < model->GetNum2dEffects(); e++) {
+						effect = model->Get2dEffect(e);
+						if (effect->type == EFFECT_ATTRACTOR && effect->attractor.probability >= randVal) {
+							objMat = &building->GetMatrix();
+							CVector effectPos = building->GetMatrix() * effect->pos;
+							effectDist = effectPos - GetPosition();
+							if (effectDist.MagnitudeSqr() < sq(8.0f)) {
+								found = true;
+								break;
+							}
+						}
+					}
+				}
 			}
 		}
-	} else
-		return;
-
-	if (IsPlayer()) {
-		car->SetStatus(STATUS_PLAYER);
-		AudioManager.PlayerJustGotInCar();
-		CCarCtrl::RegisterVehicleOfInterest(car);
-	} else {
-		car->SetStatus(STATUS_PHYSICS);
 	}
 
-	CWorld::Remove(this);
-	SetPosition(car->GetPosition());
-	CWorld::Add(this);
+	if (!found)
+		return false;
 
-	if (car->bIsAmbulanceOnDuty) {
-		car->bIsAmbulanceOnDuty = false;
-		--CCarCtrl::NumAmbulancesOnDuty;
+	CVector effectFrontLocal = Multiply3x3(*objMat, effect->attractor.dir);
+	float angleToFace = CGeneral::GetRadianAngleBetweenPoints(effectFrontLocal.x, effectFrontLocal.y, 0.0f, 0.0f);
+	randVal = CGeneral::GetRandomNumber() % 256;
+	if (randVal <= m_randomSeed % 256) {
+		m_standardTimer = CTimer::GetTimeInMilliseconds() + 2000;
+		SetLookFlag(angleToFace, true);
+		SetLookTimer(1000);
+		return false;
 	}
-	if (car->bIsFireTruckOnDuty) {
-		car->bIsFireTruckOnDuty = false;
-		--CCarCtrl::NumFiretrucksOnDuty;
+
+	CVector2D effectPos = *objMat * effect->pos;
+	switch (effect->attractor.type) {
+		case ATTRACTORTYPE_ICECREAM:
+			SetInvestigateEvent(EVENT_ICECREAM, effectPos, 0.1f, 15000, angleToFace);
+			break;
+		case ATTRACTORTYPE_STARE:
+			SetInvestigateEvent(EVENT_SHOPSTALL, effectPos, 1.0f,
+								CGeneral::GetRandomNumberInRange(8000, 10 * effect->attractor.probability + 8500),
+								angleToFace);
+			break;
+		default:
+			return true;
 	}
-	if (!car->bEngineOn) {
-		car->bEngineOn = true;
-		DMAudio.PlayOneShot(car->m_audioEntityId, SOUND_CAR_ENGINE_START, 1.0f);
+	return true;
+}
+
+// --MIAMI: Done
+void
+PlayRandomAnimationsFromAnimBlock(CPed* ped, AssocGroupId animGroup, uint32 first, uint32 amount)
+{
+	if (!ped->IsPedInControl())
+		return;
+
+	const char *groupName = CAnimManager::GetAnimGroupName(animGroup);
+	CAnimBlock *animBlock = CAnimManager::GetAnimationBlock(groupName);
+	CAnimBlendAssociation *assoc;
+	for (assoc = RpAnimBlendClumpGetFirstAssociation(ped->GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
+		int first = animBlock->firstIndex;
+		int index = assoc->hierarchy - CAnimManager::GetAnimation(0);
+		if (index >= first && index < first + animBlock->numAnims) {
+			break;
+		}
 	}
 
-	RpAnimBlendClumpSetBlendDeltas(GetClump(), ASSOC_PARTIAL, -1000.0f);
+	if (CTimer::GetTimeInMilliseconds() > ped->m_nWaitTimer && assoc)
+		assoc->flags &= ~ASSOC_REPEAT;
 
-	AddInCarAnims(car, car->pDriver == this);
-	RemoveWeaponWhenEnteringVehicle();
+	if (!assoc || assoc->blendDelta < 0.0f) {
+		int selectedAnimOffset;
+		do
+			selectedAnimOffset = CGeneral::GetRandomNumberInRange(0, amount);
+		while (assoc && first + selectedAnimOffset == assoc->animId);
 
-	if (car->bIsBus)
-		bRenderPedInCar = false;
+		assoc = CAnimManager::BlendAnimation(ped->GetClump(), animGroup, (AnimationId)(first + selectedAnimOffset), 3.0f);
 
-	bChangedSeat = true;
+		assoc->SetFinishCallback(CPed::FinishedWaitCB, ped);
+		if (assoc->flags & ASSOC_REPEAT)
+			ped->m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(3000, 8000);
+		else
+			ped->m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 8000;
+	}
 }
 
 // --MIAMI: Done
 void
-CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
+CPed::ClearWaitState(void)
 {
-	switch (newObj) {
-	case OBJECTIVE_GOTO_SEAT_ON_FOOT:
-	case OBJECTIVE_GOTO_ATM_ON_FOOT:
-	case OBJECTIVE_GOTO_BUS_STOP_ON_FOOT:
-	case OBJECTIVE_GOTO_PIZZA_ON_FOOT:
-	case OBJECTIVE_GOTO_SHELTER_ON_FOOT:
-	case OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT:
-		ClearPointGunAt();
-		SetObjective(newObj, pos);
-		m_attractorHeading = heading;
+	CAnimBlendAssociation *assoc;
+	switch (m_nWaitState) {
+		case WAITSTATE_PLAYANIM_CHAT:
+		case WAITSTATE_SIT_DOWN:
+		case WAITSTATE_SIT_DOWN_RVRS:
+		case WAITSTATE_SIT_UP:
+		case WAITSTATE_SIT_IDLE:
+		case WAITSTATE_USE_ATM:
+			if (CTimer::GetTimeInMilliseconds() <= m_nWaitTimer) {
+				if (m_nWaitState == WAITSTATE_USE_ATM) {
+					assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ATM);
+					if (assoc)
+						assoc->blendDelta = -8.0f;
+					if (m_attractor)
+						GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+
+				} else if (m_nWaitState == WAITSTATE_PLAYANIM_CHAT) {
+					assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_CHAT);
+					if (assoc)
+						assoc->blendDelta = -8.0f;
+					if (m_attractor)
+						GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+
+				} else if (m_nWaitState == WAITSTATE_SIT_DOWN || m_nWaitState == WAITSTATE_SIT_DOWN_RVRS || m_nWaitState == WAITSTATE_SIT_IDLE || m_nWaitState == WAITSTATE_SIT_UP) {
+					switch (m_nWaitState) {
+						case WAITSTATE_SIT_DOWN:
+							assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SEAT_DOWN);
+							if (assoc)
+								assoc->blendDelta = -8.0f;
+							break;
+						case WAITSTATE_SIT_IDLE:
+							assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SEAT_IDLE);
+							if (assoc)
+								assoc->blendDelta = -8.0f;
+							break;
+						case WAITSTATE_SIT_UP:
+							assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SEAT_UP);
+							if (assoc)
+								assoc->blendDelta = -8.0f;
+							break;
+						default:
+							break;
+					}
+					if (m_attractor)
+						GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+				}
+			}
+			break;
+		case WAITSTATE_RIOT:
+		{
+			CAnimBlock* riotAnimBlock = CAnimManager::GetAnimationBlock("riot");
+
+			for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
+				int first = riotAnimBlock->firstIndex;
+				int index = assoc->hierarchy - CAnimManager::GetAnimation(0);
+				if (index >= first && index < first + riotAnimBlock->numAnims) {
+					assoc->blendDelta = -1000.0f;
+				}
+			}
+			break;
+		}
+		case WAITSTATE_FAST_FALL:
+			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_KO_SKID_FRONT))
+				SetGetUp();
+
+			break;
+		case WAITSTATE_BOMBER:
+			assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BOMBER);
+			if (assoc)
+				assoc->blendDelta = -8.0f;
+			break;
+		case WAITSTATE_STRIPPER:
+		{
+			CAnimBlock* stripAnimBlock = CAnimManager::GetAnimationBlock("strip");
+
+			for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
+				int first = stripAnimBlock->firstIndex;
+				int index = assoc->hierarchy - CAnimManager::GetAnimation(0);
+				if (index >= first && index < first + stripAnimBlock->numAnims) {
+					assoc->blendDelta = -1000.0f;
+				}
+			}
+			break;
+		}
+		case WAITSTATE_LANCESITTING:
+			assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SUNBATHE);
+			if (assoc)
+				assoc->blendDelta = -8.0f;
+			break;
+		case WAITSTATE_PLAYANIM_HANDSUP_SIMPLE:
+			assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_HANDSUP);
+			if (assoc)
+				assoc->blendDelta = -8.0f;
+			break;
+		default:
+			break;
 	}
+	m_nWaitState = WAITSTATE_FALSE;
 }
 
 // --MIAMI: Done
 void
-CPed::SetObjective(eObjective newObj, CVector dest)
+CPed::SetWaitState(eWaitState state, void *time)
 {
-	if (DyingOrDead())
+	AnimationId waitAnim = NUM_STD_ANIMS;
+	CAnimBlendAssociation *animAssoc;
+
+	if (!IsPedInControl())
 		return;
 
-	if (m_prevObjective != OBJECTIVE_NONE && m_prevObjective == newObj)
+	if (m_nWaitState == WAITSTATE_RIOT && state != WAITSTATE_FALSE)
 		return;
 
-	if (m_objective == newObj) {
-		if (newObj == OBJECTIVE_GOTO_AREA_ANY_MEANS || newObj == OBJECTIVE_GOTO_AREA_ON_FOOT || newObj == OBJECTIVE_RUN_TO_AREA || newObj == OBJECTIVE_SPRINT_TO_AREA) {
-			if (m_nextRoutePointPos == dest)
-				return;
-		} else if (newObj == OBJECTIVE_GUARD_SPOT) {
-			if (m_vecSpotToGuard == dest)
-				return;
-		}
-	}
+	if (state != m_nWaitState)
+		FinishedWaitCB(nil, this);
 
-	ClearPointGunAt();
-	m_objectiveTimer = 0;
-	bObjectiveCompleted = false;
-	switch (newObj) {
-		case OBJECTIVE_GUARD_SPOT:
-			m_vecSpotToGuard = dest;
-			m_radiusToGuard = 5.0f;
+	switch (state) {
+		case WAITSTATE_TRAFFIC_LIGHTS:
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 500;
 			SetMoveState(PEDMOVE_STILL);
 			break;
-		case OBJECTIVE_GUARD_AREA:
-		case OBJECTIVE_WAIT_IN_CAR:
-		case OBJECTIVE_WAIT_IN_CAR_THEN_GET_OUT:
-		case OBJECTIVE_KILL_CHAR_ON_FOOT:
-		case OBJECTIVE_KILL_CHAR_ANY_MEANS:
-		case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
-		case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
-		case OBJECTIVE_GOTO_CHAR_ON_FOOT:
-		case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
-		case OBJECTIVE_HASSLE_CHAR:
-		case OBJECTIVE_FOLLOW_CHAR_IN_FORMATION:
-		case OBJECTIVE_LEAVE_CAR:
-		case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
-		case OBJECTIVE_ENTER_CAR_AS_DRIVER:
-		case OBJECTIVE_FOLLOW_CAR_IN_CAR:
-		case OBJECTIVE_FIRE_AT_OBJECT_FROM_VEHICLE:
-		case OBJECTIVE_DESTROY_OBJECT:
-		case OBJECTIVE_DESTROY_CAR:
-		case OBJECTIVE_GOTO_AREA_IN_CAR:
-		case OBJECTIVE_FOLLOW_CAR_ON_FOOT_WITH_OFFSET:
-		case OBJECTIVE_GUARD_ATTACK:
-		case OBJECTIVE_SET_LEADER:
-		case OBJECTIVE_FOLLOW_ROUTE:
-		case OBJECTIVE_SOLICIT_VEHICLE:
-		case OBJECTIVE_HAIL_TAXI:
-		case OBJECTIVE_CATCH_TRAIN:
-		case OBJECTIVE_BUY_ICE_CREAM:
-		case OBJECTIVE_STEAL_ANY_CAR:
-		case OBJECTIVE_STEAL_ANY_MISSION_CAR:
-		case OBJECTIVE_MUG_CHAR:
-		case OBJECTIVE_LEAVE_CAR_AND_DIE:
-		case OBJECTIVE_FLEE_CAR:
-		case OBJECTIVE_SUN_BATHE:
-		case OBJECTIVE_AIM_GUN_AT:
-		case OBJECTIVE_WANDER:
-		case OBJECTIVE_WAIT_ON_FOOT_AT_SHELTER:
-		case OBJECTIVE_KILL_CHAR_ON_BOAT:
-		case OBJECTIVE_SOLICIT_FOOT:
-		case OBJECTIVE_WAIT_ON_FOOT_AT_BUS_STOP:
+		case WAITSTATE_CROSS_ROAD:
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 1000;
+			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_HBHB, 4.0f);
 			break;
-		case OBJECTIVE_GOTO_AREA_ANY_MEANS:
-		case OBJECTIVE_GOTO_AREA_ON_FOOT:
-		case OBJECTIVE_GOTO_SEAT_ON_FOOT:
-		case OBJECTIVE_GOTO_ATM_ON_FOOT:
-		case OBJECTIVE_GOTO_BUS_STOP_ON_FOOT:
-		case OBJECTIVE_GOTO_PIZZA_ON_FOOT:
-		case OBJECTIVE_GOTO_SHELTER_ON_FOOT:
-		case OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT:
-			bIsRunning = false;
-			m_pNextPathNode = nil;
-			m_nextRoutePointPos = dest;
-			m_vecSeekPos = m_nextRoutePointPos;
-			m_distanceToCountSeekDone = 0.5f;
-			if (newObj == OBJECTIVE_GOTO_ATM_ON_FOOT) {
-				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
-				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
-			}
-			if (newObj == OBJECTIVE_GOTO_SEAT_ON_FOOT) {
-				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
-				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
-			}
-			if (newObj == OBJECTIVE_GOTO_BUS_STOP_ON_FOOT) {
-				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
-				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
-			}
-			if (newObj == OBJECTIVE_GOTO_PIZZA_ON_FOOT) {
-				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
-				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
-			}
-			if (newObj == OBJECTIVE_GOTO_SHELTER_ON_FOOT) {
-				bIsRunning = true;
-				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
-				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
-			}
-			if (newObj == OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT) {
-				bIsRunning = true;
-				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
-				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
+		case WAITSTATE_CROSS_ROAD_LOOK:
+			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_ROAD_CROSS, 8.0f);
+
+			if (time)
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
+			else
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(2000,5000);
+
+			break;
+		case WAITSTATE_LOOK_PED:
+		case WAITSTATE_LOOK_SHOP:
+		case WAITSTATE_LOOK_ACCIDENT:
+		case WAITSTATE_FACEOFF_GANG:
+		case WAITSTATE_RIOT:
+		case WAITSTATE_STRIPPER:
+			break;
+		case WAITSTATE_DOUBLEBACK:
+			m_headingRate = 0.0f;
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 3500;
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_HBHB, 4.0f);
+#ifdef FIX_BUGS
+			animAssoc->SetFinishCallback(RestoreHeadingRateCB, this);
+#endif
+			break;
+		case WAITSTATE_HITWALL:
+			m_headingRate = 2.0f;
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_HIT_WALL, 16.0f);
+			animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+			animAssoc->flags |= ASSOC_FADEOUTWHENDONE;
+			animAssoc->SetDeleteCallback(FinishedWaitCB, this);
+
+			if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && CharCreatedBy == RANDOM_CHAR && m_nPedState == PED_SEEK_CAR) {
+				ClearObjective();
+				RestorePreviousState();
+				m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 30000;
 			}
-			bUsePedNodeSeek = false;
-			if (sq(m_distanceToCountSeekDone) > (m_nextRoutePointPos - GetPosition()).MagnitudeSqr2D()) {
-				if (!IsUseAttractorObjective(m_objective))
-					return;
-				if (Abs(m_fRotationCur - m_attractorHeading) < m_acceptableHeadingOffset)
-					return;
+			break;
+		case WAITSTATE_TURN180:
+			m_headingRate = 0.0f;
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_TURN_180, 4.0f);
+			animAssoc->SetFinishCallback(FinishedWaitCB, this);
+			break;
+		case WAITSTATE_SURPRISE:
+			m_headingRate = 0.0f;
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 2000;
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_HIT_WALL, 4.0f);
+			animAssoc->SetFinishCallback(FinishedWaitCB, this);
+			break;
+		case WAITSTATE_STUCK:
+			SetMoveState(PEDMOVE_STILL);
+			SetMoveAnim();
+			m_headingRate = 0.0f;
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_TIRED, 4.0f);
+#ifdef FIX_BUGS
+			animAssoc->SetFinishCallback(RestoreHeadingRateCB, this);
+#endif
+
+			// Random char as passenger? Cop, medic etc.?
+			if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && CharCreatedBy == RANDOM_CHAR && m_nPedState == PED_SEEK_CAR) {
+				ClearObjective();
+				RestorePreviousState();
+				m_hitRecoverTimer = CTimer::GetTimeInMilliseconds() + 30000;
 			}
 			break;
-		case OBJECTIVE_RUN_TO_AREA:
-		case OBJECTIVE_SPRINT_TO_AREA:
-			bIsRunning = true;
-			m_pNextPathNode = nil;
-			m_nextRoutePointPos = dest;
-			m_vecSeekPos = m_nextRoutePointPos;
-			m_distanceToCountSeekDone = 0.5f;
-			bUsePedNodeSeek = true;
-			if (sq(m_distanceToCountSeekDone) > (m_nextRoutePointPos - GetPosition()).MagnitudeSqr2D())
-				return;
+		case WAITSTATE_LOOK_ABOUT:
+			SetMoveState(PEDMOVE_STILL);
+			SetMoveAnim();
+			m_headingRate = 0.0f;
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_HBHB, 4.0f);
+#ifdef FIX_BUGS
+			animAssoc->SetFinishCallback(RestoreHeadingRateCB, this);
+#endif
+
 			break;
-		default: break;
-	}
+		case WAITSTATE_PLAYANIM_COWER:
+			waitAnim = ANIM_HANDSCOWER;
+		case WAITSTATE_PLAYANIM_HANDSUP:
+			if (waitAnim == NUM_STD_ANIMS)
+				waitAnim = ANIM_HANDSUP;
+		case WAITSTATE_PLAYANIM_HANDSCOWER:
+			if (waitAnim == NUM_STD_ANIMS)
+				waitAnim = ANIM_HANDSCOWER;
+			m_headingRate = 0.0f;
+			if (time)
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
+			else
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 3000;
 
-	if (IsTemporaryObjective(m_objective)) {
-		m_prevObjective = newObj;
-	} else {
-		if (m_objective != newObj)
-			SetStoredObjective();
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, waitAnim, 4.0f);
+			animAssoc->SetDeleteCallback(FinishedWaitCB, this);
+			break;
+		case WAITSTATE_PLAYANIM_DUCK:
+			waitAnim = ANIM_DUCK_DOWN;
+		case WAITSTATE_PLAYANIM_TAXI:
+			if (waitAnim == NUM_STD_ANIMS)
+				waitAnim = ANIM_IDLE_TAXI;
+		case WAITSTATE_PLAYANIM_CHAT:
+			if (waitAnim == NUM_STD_ANIMS)
+				waitAnim = ANIM_IDLE_CHAT;
+			if (time)
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
+			else
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 3000;
 
-		m_objective = newObj;
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, waitAnim, 4.0f);
+			animAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
+			animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+			animAssoc->SetDeleteCallback(FinishedWaitCB, this);
+			break;
+		case WAITSTATE_FINISH_FLEE:
+			SetMoveState(PEDMOVE_STILL);
+			SetMoveAnim();
+			m_headingRate = 0.0f;
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 2500;
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_TIRED, 4.0f);
+#ifdef FIX_BUGS
+			animAssoc->SetFinishCallback(RestoreHeadingRateCB, this);
+#endif
+			break;
+		case WAITSTATE_SIT_DOWN:
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_SEAT_DOWN, 4.0f);
+			animAssoc->SetFinishCallback(FinishedWaitCB, this);
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 100000;
+			break;
+		case WAITSTATE_SIT_UP:
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_SEAT_UP, 4.0f);
+			animAssoc->SetFinishCallback(FinishedWaitCB, this);
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 100000;
+			break;
+		case WAITSTATE_SIT_IDLE:
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_SEAT_IDLE, 128.f);
+			animAssoc->SetFinishCallback(FinishedWaitCB, this);
+			if (time)
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
+			else
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(25000, 30000);
+			break;
+		case WAITSTATE_USE_ATM:
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_ATM, 4.0f);
+			animAssoc->SetFinishCallback(FinishedWaitCB, this);
+			if (time)
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
+			else
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 100000;
+			break;
+		case WAITSTATE_SUN_BATHE_IDLE:
+			m_headingRate = 0.0f;
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_SUNBATHE, ANIM_SUNBATHE, 4.0f);
+			animAssoc->SetDeleteCallback(DeleteSunbatheIdleAnimCB, this);
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(50000, 100000);
+			break;
+		case WAITSTATE_FAST_FALL:
+			SetFall(-1, ANIM_KO_SKID_FRONT, true);
+			break;
+		case WAITSTATE_BOMBER:
+			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_BOMBER, 4.0f);
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
+			break;
+		case WAITSTATE_GROUND_ATTACK:
+		{
+			CWeaponInfo* currentWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
+			if (!currentWeapon)
+				break;
+			if (GetFireAnimGround(currentWeapon, false)) {
+				if (!RpAnimBlendClumpGetAssociation(GetClump(), GetFireAnimGround(currentWeapon, false))) {
+					m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
+					CAnimBlendAssociation* newAnim = CAnimManager::BlendAnimation(GetClump(),
+						currentWeapon->m_AnimToPlay, GetFireAnimGround(currentWeapon, false), 8.0f);
+					newAnim->SetDeleteCallback(FinishedWaitCB, this);
+				}
+			}
+			break;
+		}
+		case WAITSTATE_LANCESITTING:
+			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_LANCE, ANIM_SUNBATHE, 4.0f);
+			break;
+		case WAITSTATE_PLAYANIM_HANDSUP_SIMPLE:
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_HANDSUP, 4.0f);
+			animAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
+			animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+			animAssoc->SetDeleteCallback(FinishedWaitCB, this);
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
+			break;
+		default:
+			ClearWaitState();
+			RestoreHeadingRate();
+			return;
 	}
+	m_nWaitState = state;
 }
 
 // --MIAMI: Done
 void
-CPed::SetMoveAnim(void)
+CPed::Wait(void)
 {
-	if (m_nStoredMoveState == m_nMoveState || !IsPedInControl() || m_attachedTo)
-		return;
+	AnimationId mustHaveAnim = NUM_STD_ANIMS;
+	CAnimBlendAssociation *animAssoc;
+	CPed *pedWeLook;
 
-	if (m_nMoveState == PEDMOVE_NONE) {
-		m_nStoredMoveState = PEDMOVE_NONE;
+	if (DyingOrDead()) {
+		ClearWaitState();
+		RestoreHeadingRate();
 		return;
 	}
 
-	AssocGroupId animGroupToUse;
-	if (m_leader && m_leader->IsPlayer())
-		animGroupToUse = ASSOCGRP_PLAYER;
-	else
-		animGroupToUse = m_animGroup;
+	switch (m_nWaitState) {
 
-	CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_BLOCK);
-	if (!animAssoc) {
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FIGHT_IDLE);
-		if (!animAssoc)
-			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCHRELOAD);
+		case WAITSTATE_TRAFFIC_LIGHTS:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				if (CTrafficLights::LightForPeds() == PED_LIGHTS_WALK) {
+					ClearWaitState();
+					SetMoveState(PEDMOVE_WALK);
+				}
+			}
+			break;
 
-		if (animAssoc && m_nPedState == PED_FIGHT)
-			return;
+		case WAITSTATE_CROSS_ROAD:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				if (CGeneral::GetRandomNumber() & 1 || !m_nWaitTimer)
+					ClearWaitState();
+				else
+					SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, nil);
 
-		if (animAssoc) {
-			CAnimBlendAssociation *idleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE);
-			if (!idleAssoc || idleAssoc->blendDelta <= 0.0f) {
-				animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-				animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_IDLE_STANCE, 8.0f);
+				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_HBHB);
+				if (animAssoc) {
+					animAssoc->blendDelta = -8.0f;
+					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+				}
 			}
-		}
-	}
-	if (!animAssoc) {
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_TIRED);
-		if (animAssoc)
-			if (m_nWaitState == WAITSTATE_STUCK || m_nWaitState == WAITSTATE_FINISH_FLEE)
-				return;
+			break;
 
-		if (animAssoc) {
-			CAnimBlendAssociation *idleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE);
-			if (!idleAssoc || idleAssoc->blendDelta <= 0.0f) {
-				animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-				animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_IDLE_STANCE, 4.0f);
+		case WAITSTATE_CROSS_ROAD_LOOK:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				ClearWaitState();
+				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ROAD_CROSS);
+				if (animAssoc) {
+					animAssoc->blendDelta = -8.0f;
+					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+				}
 			}
-		}
-	}
-	if (!animAssoc) {
-		m_nStoredMoveState = m_nMoveState;
-		if (m_nMoveState == PEDMOVE_WALK || m_nMoveState == PEDMOVE_RUN || m_nMoveState == PEDMOVE_SPRINT) {
-			for (CAnimBlendAssociation *assoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
-				assoc; assoc = RpAnimBlendGetNextAssociation(assoc, ASSOC_PARTIAL)) {
+			break;
 
-				if (!(assoc->flags & ASSOC_FADEOUTWHENDONE)) {
-					assoc->blendDelta = -2.0f;
-					assoc->flags |= ASSOC_DELETEFADEDOUT;
+		case WAITSTATE_DOUBLEBACK:
+			if (CTimer::GetTimeInMilliseconds() <= m_nWaitTimer) {
+				uint32 timeLeft = m_nWaitTimer - CTimer::GetTimeInMilliseconds();
+				if (timeLeft < 2500 && timeLeft > 2000) {
+					m_nWaitTimer -= 500;
+					CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_XPRESS_SCRATCH, 4.0f);
 				}
+			} else {
+				ClearWaitState();
+				SetMoveState(PEDMOVE_WALK);
 			}
+			break;
 
-			ClearAimFlag();
-			ClearLookFlag();
-		}
+		case WAITSTATE_HITWALL:
+			if (CTimer::GetTimeInMilliseconds() <= m_nWaitTimer) {
+				if (m_collidingThingTimer > CTimer::GetTimeInMilliseconds()) {
+					m_collidingThingTimer = CTimer::GetTimeInMilliseconds() + 2500;
+				}
+			} else {
+				ClearWaitState();
+			}
+			break;
 
-		switch (m_nMoveState) {
-			case PEDMOVE_STILL:
-				animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_IDLE_STANCE, 4.0f);
-				break;
-			case PEDMOVE_WALK:
-				animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_WALK, 1.0f);
-				break;
-			case PEDMOVE_RUN:
-				if (m_nPedState == PED_FLEE_ENTITY) {
-					animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_RUN, 3.0f);
+		case WAITSTATE_TURN180:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				ClearWaitState();
+				m_fRotationCur = m_fRotationCur + PI;
+				if (m_nPedState == PED_INVESTIGATE)
+					ClearInvestigateEvent();
+			}
+
+			if (m_collidingThingTimer > CTimer::GetTimeInMilliseconds()) {
+				m_collidingThingTimer = CTimer::GetTimeInMilliseconds() + 2500;
+			}
+			break;
+
+		case WAITSTATE_SURPRISE:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_HIT_WALL)) {
+					animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_XPRESS_SCRATCH, 4.0f);
+					animAssoc->SetFinishCallback(FinishedWaitCB, this);
+					m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
 				} else {
-					animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_RUN, 1.0f);
+					ClearWaitState();
 				}
+			}
+			break;
+
+		case WAITSTATE_STUCK:
+			if (CTimer::GetTimeInMilliseconds() <= m_nWaitTimer)
 				break;
-			case PEDMOVE_SPRINT:
-				animAssoc = CAnimManager::BlendAnimation(GetClump(), animGroupToUse, ANIM_SPRINT, 1.0f);
-				break;
-			default:
-				break;
-		}
 
-		if (animAssoc) {
-			if (m_leader) {
-				CAnimBlendAssociation *walkAssoc = RpAnimBlendClumpGetAssociation(m_leader->GetClump(), ANIM_WALK);
-				if (!walkAssoc)
-					walkAssoc = RpAnimBlendClumpGetAssociation(m_leader->GetClump(), ANIM_RUN);
+			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_TIRED);
 
-				if (!walkAssoc)
-					walkAssoc = RpAnimBlendClumpGetAssociation(m_leader->GetClump(), ANIM_SPRINT);
+			if (!animAssoc)
+				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_TURN_180);
+			if (!animAssoc)
+				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_XPRESS_SCRATCH);
+			if (!animAssoc)
+				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ROAD_CROSS);
 
-				if (walkAssoc) {
-					animAssoc->speed = walkAssoc->speed;
+			if (animAssoc) {
+				if (animAssoc->IsPartial()) {
+					animAssoc->blendDelta = -8.0f;
+					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
 				} else {
-					if (CharCreatedBy == MISSION_CHAR)
-						animAssoc->speed = 1.0f;
-					else
-						animAssoc->speed = 1.2f - m_randomSeed * 0.4f / MYRAND_MAX;
-							
+					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+					CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 4.0f);
 				}
-			} else {
-				if (CharCreatedBy == MISSION_CHAR)
-					animAssoc->speed = 1.0f;
-				else
-					animAssoc->speed = 1.2f - m_randomSeed * 0.4f / MYRAND_MAX;
-			}
-		}
-	}
-}
 
+				if (animAssoc->animId == ANIM_TURN_180) {
+					m_fRotationCur = CGeneral::LimitRadianAngle(PI + m_fRotationCur);
+					ClearWaitState();
+					SetMoveState(PEDMOVE_WALK);
+					m_nStoredMoveState = PEDMOVE_NONE;
+					m_panicCounter = 0;
+					return;
+				}
+			}
 
-// --MIAMI: Done
-void
-CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
-{
-	float zDiff = 0.0f;
-	car->m_nGettingInFlags |= doorFlag;
-	bVehEnterDoorIsBlocked = false;
-	if (m_nPedState != PED_SEEK_CAR && m_nPedState != PED_SEEK_IN_BOAT)
-		SetStoredState();
+			AnimationId animToPlay;
 
-	m_pSeekTarget = car;
-	m_pSeekTarget->RegisterReference((CEntity **) &m_pSeekTarget);
-	m_vehEnterType = doorNode;
-	SetPedState(PED_ENTER_CAR);
-	if (m_vehEnterType == CAR_DOOR_RF && m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER && !car->IsBike()) {
-		car->bIsBeingCarJacked = true;
-	}
+			switch (CGeneral::GetRandomNumber() & 3) {
+				case 0:
+					animToPlay = ANIM_ROAD_CROSS;
+					break;
+				case 1:
+					animToPlay = ANIM_IDLE_TIRED;
+					break;
+				case 2:
+					animToPlay = ANIM_XPRESS_SCRATCH;
+					break;
+				case 3:
+					animToPlay = ANIM_TURN_180;
+					break;
+				default:
+					break;
+			}
 
-	m_pMyVehicle = (CVehicle*)m_pSeekTarget;
-	m_pMyVehicle->RegisterReference((CEntity**) &m_pMyVehicle);
-	((CVehicle*)m_pSeekTarget)->m_nNumGettingIn++;
-	bUsesCollision = false;
-	CVector doorOpenPos = GetPositionToOpenCarDoor(car, m_vehEnterType);
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animToPlay, 4.0f);
 
-	// Because buses have stairs
-	if (!m_pMyVehicle->bIsBus)
-		zDiff = Max(0.0f, doorOpenPos.z - GetPosition().z);
+			if (animToPlay == ANIM_TURN_180)
+				animAssoc->SetFinishCallback(FinishedWaitCB, this);
 
-	m_vecOffsetSeek = doorOpenPos - GetPosition();
-	m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 600;
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(1500, 5000);
+			break;
 
-	if (car->IsBoat()) {
-		if (car->pHandling->Flags & HANDLING_SIT_IN_BOAT)
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f);
-		else
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT, 100.0f);
+		case WAITSTATE_LOOK_ABOUT:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				ClearWaitState();
+				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_HBHB);
+				if (animAssoc) {
+					animAssoc->blendDelta = -8.0f;
+					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+				}
+			}
+			break;
 
-		PedSetInCarCB(nil, this);
-		bVehExitWillBeInstant = true;
+		case WAITSTATE_PLAYANIM_HANDSUP:
+			mustHaveAnim = ANIM_HANDSUP;
+			
+		case WAITSTATE_PLAYANIM_HANDSCOWER:
+			if (mustHaveAnim == NUM_STD_ANIMS)
+				mustHaveAnim = ANIM_HANDSCOWER;
 
-	} else if (car->IsBike()) {
-		PedAnimAlignCB(0, this);
-		car->AutoPilot.m_nCruiseSpeed = 0;
+			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), mustHaveAnim);
+			pedWeLook = (CPed*) m_pLookTarget;
 
-	} else {
-		if (m_vehEnterType == CAR_DOOR_LF || m_vehEnterType == CAR_DOOR_LR)
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, zDiff > 4.4f ? ANIM_CAR_ALIGNHI_RHS : ANIM_CAR_ALIGN_RHS, 4.0f);
-		else
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, zDiff > 4.4f ? ANIM_CAR_ALIGNHI_LHS : ANIM_CAR_ALIGN_LHS, 4.0f);
-		m_pVehicleAnim->SetFinishCallback(PedAnimAlignCB, this);
-	}
-}
+			if ((!m_pLookTarget || !m_pLookTarget->IsPed() || pedWeLook->m_pPointGunAt)
+				&& m_nPedState != PED_FLEE_ENTITY
+				&& m_nPedState != PED_ATTACK
+				&& CTimer::GetTimeInMilliseconds() <= m_nWaitTimer
+				&& animAssoc) {
 
-// --MIAMI: Done
-void
-CPed::WanderPath(void)
-{
-	if (!m_pNextPathNode) {
-		printf("THIS SHOULDN@T HAPPEN TOO OFTEN\n");
-		SetIdle();
-		return;
-	}
-	if (m_nWaitState == WAITSTATE_FALSE) {
-		if (m_nMoveState == PEDMOVE_STILL || m_nMoveState == PEDMOVE_NONE)
-			SetMoveState(PEDMOVE_WALK);
-	}
-	m_vecSeekPos = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
-	m_vecSeekPos.z += 1.0f;
+				if (pedWeLook)
+					TurnBody();
+			} else {
+				ClearWaitState();
+				m_nWaitTimer = 0;
+				if (m_pLookTarget && m_pLookTarget->IsPed()) {
+					if (m_nPedState != PED_FLEE_ENTITY && m_nPedState != PED_ATTACK) {
+						if (bCrouchWhenScared) {
+							if (bIsDucking) {
+								ClearDuck(false);
+								SetDuck(10000, true);
+							}
 
-	// Only returns true when ped is stuck(not stopped) I think, then we should assign new direction or wait state to him.
-	if (!Seek())
-		return;
+						} else if (m_pedStats->m_fear <= 100 - pedWeLook->m_pedStats->m_temper) {
+							if (GetWeapon()->IsTypeMelee()) {
+								if(m_pedStats->m_flags & STAT_GUN_PANIC) {
+									SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, m_pLookTarget);
+									if (m_nPedState == PED_FLEE_ENTITY || m_nPedState == PED_FLEE_POS) {
 
-	CPathNode *previousLastNode = m_pLastPathNode;
-	uint8 randVal = (m_randomSeed + 3 * CTimer::GetFrameCounter()) % 100;
+										bUsePedNodeSeek = true;
+										m_pNextPathNode = nil;
+									}
+									if (m_nMoveState != PEDMOVE_RUN)
+										SetMoveState(PEDMOVE_WALK);
 
-	// We don't prefer 180-degree turns in normal situations
-	uint8 dirWeWouldntPrefer = m_nPathDir;
-	if (dirWeWouldntPrefer <= 3)
-		dirWeWouldntPrefer += 4;
-	else
-		dirWeWouldntPrefer -= 4;
+									if (m_nPedType != PEDTYPE_COP) {
+										ProcessObjective();
+										SetMoveState(PEDMOVE_WALK);
+									}
+								} else {
+									SetObjective(OBJECTIVE_NONE);
+									SetWanderPath(CGeneral::GetRandomNumberInRange(0.0f, 8.0f));
+								}
+							} else {
+								SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, m_pLookTarget);
+								SetObjectiveTimer(20000);
+							}
+						} else {
+							SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, m_pLookTarget);
+							if (m_nPedState == PED_FLEE_ENTITY || m_nPedState == PED_FLEE_POS)
+							{
+								bUsePedNodeSeek = true;
+								m_pNextPathNode = nil;
+							}
+							SetMoveState(PEDMOVE_RUN);
+							Say(SOUND_PED_FLEE_RUN);
+						}
+					}
+				}
+				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), mustHaveAnim);
+				if (animAssoc) {
+					animAssoc->blendDelta = -4.0f;
+					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+				}
+			}
+			break;
+		case WAITSTATE_PLAYANIM_COWER:
+			mustHaveAnim = ANIM_HANDSCOWER;
 
-	CPathNode *nodeWeWouldntPrefer = nil;
-	uint8 dirToSet = 9; // means undefined
-	uint8 dirWeWouldntPrefer2 = 9; // means undefined
-	uint8 tryCount = 0;
+		case WAITSTATE_PLAYANIM_DUCK:
+			if (mustHaveAnim == NUM_STD_ANIMS)
+				mustHaveAnim = ANIM_DUCK_DOWN;
 
-	if (randVal <= 90) {
-		if (randVal > 80) {
-			m_nPathDir += 2;
-			m_nPathDir %= 8;
-		}
-	} else {
-		m_nPathDir -= 2;
-		if (m_nPathDir < 0)
-			m_nPathDir += 8;
-	}
+		case WAITSTATE_PLAYANIM_TAXI:
+			if (mustHaveAnim == NUM_STD_ANIMS)
+				mustHaveAnim = ANIM_IDLE_TAXI;
 
-	m_pLastPathNode = m_pNextPathNode;
-	ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode,
-		m_nPathDir, &dirToSet);
+		case WAITSTATE_PLAYANIM_CHAT:
+			if (mustHaveAnim == NUM_STD_ANIMS)
+				mustHaveAnim = ANIM_IDLE_CHAT;
 
-	if (((CPedModelInfo*)CModelInfo::GetModelInfo(m_modelIndex))->m_pedStatType == PEDSTAT_SKATER) {
-		if (m_pNextPathNode) {
-			CVector unpacked(m_pNextPathNode->GetPosition() / 8.f);
-			if (!CPopulation::IsSkateable(unpacked))
-				m_pNextPathNode = nil;
-		}
-	}
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), mustHaveAnim);
+				if (animAssoc) {
+					animAssoc->blendDelta = -4.0f;
+					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+				}
+				if (m_attractor && m_objective == OBJECTIVE_WAIT_ON_FOOT_AT_ICE_CREAM_VAN) {
+					GetPedAttractorManager()->BroadcastDeparture(this, m_attractor);
+					bBoughtIceCream = true;
+				}
+				ClearWaitState();
+			} 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) {
 
-	// NB: SetWanderPath checks for m_nPathDir == dirToStartWith, this one checks for tryCount > 7
-	while (!m_pNextPathNode) {
-		tryCount++;
-		m_nPathDir = (m_nPathDir + 1) % 8;
+						if (m_pLookTarget)
+							m_pLookTarget->CleanUpOldReference(&m_pLookTarget);
+						m_pLookTarget = m_pedInObjective;
+						m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
+						TurnBody();
+					}
+				}
+			}
+			break;
 
-		// We're at where we started and couldn't find any node
-		if (tryCount > 7) {
-			if (!nodeWeWouldntPrefer) {
-				ClearAll();
-				SetIdle();
-				// Probably this text carried over here after copy-pasting this loop from early version of SetWanderPath.
-				Error("Can't find valid path node, SetWanderPath, Ped.cpp");
-				return;
+		case WAITSTATE_FINISH_FLEE:
+			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_TIRED);
+			if (animAssoc) {
+				if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+					CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 4.0f);
+					int timer = 2000;
+					ClearWaitState();
+					SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, &timer);
+				}
+			} else {
+				ClearWaitState();
 			}
-			m_pNextPathNode = nodeWeWouldntPrefer;
-			dirToSet = dirWeWouldntPrefer2;
-		} else {
-			ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode,
-				m_nPathDir, &dirToSet);
-			if (m_pNextPathNode) {
-				if (dirToSet == dirWeWouldntPrefer) {
-					nodeWeWouldntPrefer = m_pNextPathNode;
-					dirWeWouldntPrefer2 = dirToSet;
+			break;
+		case WAITSTATE_SIT_DOWN:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				ClearWaitState();
+				SetWaitState(WAITSTATE_SIT_IDLE, 0);
+			}
+			break;
+		//case WAITSTATE_SIT_DOWN_RVRS:
+		case WAITSTATE_SIT_UP:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				if (m_attractor)
+					GetPedAttractorManager()->BroadcastDeparture(this, m_attractor);
+				ClearWaitState();
+				if (bFleeWhenStanding) {
+					if (m_threatEx) {
+						SetFlee(m_threatEx, 10000);
+						bFleeWhenStanding = false;
+						m_threatEx = nil;
+						Say(SOUND_PED_FLEE_SPRINT);
+					}
+				}
+			}
+			break;
+		case WAITSTATE_SIT_IDLE:
+			if (bTurnedAroundOnAttractor) {
+				m_fRotationCur += PI;
+				m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
+				m_fRotationDest = m_fRotationCur;
+				bTurnedAroundOnAttractor = false;
+			}
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				ClearWaitState();
+				SetWaitState(WAITSTATE_SIT_UP, 0);
+			} else {
+				if (m_fleeFrom && m_fleeFrom->IsVehicle()) {
 					m_pNextPathNode = nil;
+					m_threatEx = m_threatEntity;
+					bFleeWhenStanding = true;
+					ClearWaitState();
+					SetWaitState(WAITSTATE_SIT_UP, 0);
+				} else {
+					uint32 threatFlag = ScanForThreats();
+					if (threatFlag == PED_FLAG_GUN || threatFlag == PED_FLAG_EXPLOSION || threatFlag == PED_FLAG_DEADPEDS) {
+						m_pNextPathNode = nil;
+						m_threatEx = m_threatEntity;
+						bFleeWhenStanding = true;
+						ClearWaitState();
+						SetWaitState(WAITSTATE_SIT_UP, 0);
+					}
 				}
 			}
-			if (((CPedModelInfo*)CModelInfo::GetModelInfo(m_modelIndex))->m_pedStatType == PEDSTAT_SKATER) {
-				if (m_pNextPathNode) {
-					CVector unpacked(m_pNextPathNode->GetPosition() / 8.f);
-					if (!CPopulation::IsSkateable(unpacked))
+			break;
+		case WAITSTATE_USE_ATM:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				if (m_attractor)
+					GetPedAttractorManager()->BroadcastDeparture(this, m_attractor);
+				ClearWaitState();
+			}
+			break;
+		case WAITSTATE_SUN_BATHE_IDLE:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer && bCanGiveUpSunbathing) {
+				m_pNextPathNode = nil;
+				bGotUpOfMyOwnAccord = true;
+				SetGetUp();
+				ClearWaitState();
+
+			} else if (CWeather::Rain <= 0.1f) {
+				if (CClock::GetHours() <= 18 || CGeneral::GetRandomNumberInRange(0.f, 1.0f) < 0.005f) {
+					uint32 threatFlag = ScanForThreats();
+					if (threatFlag == PED_FLAG_GUN || threatFlag == PED_FLAG_EXPLOSION || threatFlag == PED_FLAG_DEADPEDS) {
+						// Get up in case of danger
 						m_pNextPathNode = nil;
+						m_threatEx = m_threatEntity;
+						bFleeWhenStanding = true;
+						SetGetUp();
+						ClearWaitState();
+					}
+					CPlayerPed *player = FindPlayerPed();
+					if (player) {
+						// Get up if player coming towards us with a car
+						if (player->InVehicle()){
+							CVector vehSpeedPerSec = player->m_pMyVehicle->m_vecMoveSpeed * GAME_SPEED_TO_METERS_PER_SECOND;
+							CVector vehPos = player->m_pMyVehicle->GetPosition();
+							CVector ourPos = GetPosition();
+							float timeUntilVehReachPed = DotProduct(ourPos - vehPos, vehSpeedPerSec) / vehSpeedPerSec.MagnitudeSqr();
+							if (timeUntilVehReachPed > 0.0 && timeUntilVehReachPed < 8.0f) {
+								if ((ourPos - (timeUntilVehReachPed * vehSpeedPerSec + vehPos)).Magnitude() < 5.0f) {
+									m_pNextPathNode = nil;
+									m_threatEx = player;
+									bFleeWhenStanding = true;
+									SetGetUp();
+									ClearWaitState();
+								}
+							}
+						}
+					}
+				} else {
+					m_pNextPathNode = nil;
+					bGotUpOfMyOwnAccord = true;
+					SetGetUp();
+					ClearWaitState();
 				}
+			} else {
+				m_pNextPathNode = nil;
+				bGotUpOfMyOwnAccord = true;
+				SetGetUp();
+				ClearWaitState();
+			}
+			break;
+		case WAITSTATE_RIOT:
+			if (m_nPedState == PED_FLEE_ENTITY || m_nPedState == PED_ATTACK) {
+				ClearWaitState();
+				break;
 			}
-		}
-	}
 
-	m_nPathDir = dirToSet;
-	if (m_pLastPathNode == m_pNextPathNode) {
-		m_pNextPathNode = previousLastNode;
-		SetWaitState(WAITSTATE_DOUBLEBACK, nil);
-		Say(SOUND_PED_WAIT_DOUBLEBACK);
-	} else if (ThePaths.TestForPedTrafficLight(m_pLastPathNode, m_pNextPathNode)) {
-		SetWaitState(WAITSTATE_TRAFFIC_LIGHTS, nil);
-	} else if (ThePaths.TestCrossesRoad(m_pLastPathNode, m_pNextPathNode)) {
-		SetWaitState(WAITSTATE_CROSS_ROAD, nil);
-	} else if (m_pNextPathNode == previousLastNode) {
-		SetWaitState(WAITSTATE_DOUBLEBACK, nil);
-		Say(SOUND_PED_WAIT_DOUBLEBACK);
+			PlayRandomAnimationsFromAnimBlock(this, ASSOCGRP_RIOT, ANIM_RIOT_ANGRY, ANIM_RIOT_FUKU - ANIM_RIOT_ANGRY + 1);
+			if (IsPedInControl() && CGeneral::GetRandomNumberInRange(0.f,1.f) < 0.25f
+				&& CPopulation::CanJeerAtStripper(m_modelIndex)) {
+				for (int i = 0; i < m_numNearPeds; ++i) {
+					CPed *nearPed = m_nearPeds[i];
+					if (nearPed) {
+						if ((GetPosition() - nearPed->GetPosition()).MagnitudeSqr() < sq(10.f)) {
+							for (int anim = ANIM_STRIP_A; anim <= ANIM_STRIP_G; anim++) {
+								if (RpAnimBlendClumpGetAssociation(nearPed->GetClump(), anim))
+									Say(SOUND_PED_149);
+							}
+						}
+					}
+				}
+			}
+			break;
+		case WAITSTATE_BOMBER:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer)
+				ClearWaitState();
+			break;
+		case WAITSTATE_STRIPPER:
+			PlayRandomAnimationsFromAnimBlock(this, ASSOCGRP_STRIP, ANIM_STRIP_A, ANIM_STRIP_G - ANIM_STRIP_A + 1);
+			break;
+		case WAITSTATE_PLAYANIM_HANDSUP_SIMPLE:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer)
+				ClearWaitState();
+			break;
+		default:
+			break;
 	}
+
+	if(!m_nWaitState)
+		RestoreHeadingRate();
 }
 
 // --MIAMI: Done
-bool
-CPed::WarpPedToNearEntityOffScreen(CEntity *warpTo)
+void
+CPed::DeleteSunbatheIdleAnimCB(CAnimBlendAssociation *assoc, void *arg)
 {
-	bool teleported = false;
-	if (GetIsOnScreen() || m_leaveCarTimer > CTimer::GetTimeInMilliseconds())
-		return false;
+	CPed *ped = (CPed*) arg;
 
-	CVector warpToPos = warpTo->GetPosition();
-	CVector distVec = warpToPos - GetPosition();
-	float halfOfDist = distVec.Magnitude() * 0.5f;
-	CVector halfNormalizedDist = distVec / halfOfDist;
-
-	CVector appropriatePos = GetPosition();
-	int tryCount = Min(10, (int)halfOfDist);
-	for (int i = 0; i < tryCount; ++i) {
-		appropriatePos += halfNormalizedDist;
-		CVector zCorrectedPos = appropriatePos;
-		CPedPlacement::FindZCoorForPed(&zCorrectedPos);
-
-		if (Abs(zCorrectedPos.z - warpToPos.z) < 3.0f || Abs(zCorrectedPos.z - appropriatePos.z) < 3.0f) {
-			appropriatePos.z = zCorrectedPos.z;
-			if (!TheCamera.IsSphereVisible(appropriatePos, 0.6f, &TheCamera.GetCameraMatrix())
-				&& CWorld::GetIsLineOfSightClear(appropriatePos, warpToPos, true, true, false, true, false, false, false)
-				&& !CWorld::TestSphereAgainstWorld(appropriatePos, 0.6f, this, true, true, false, true, false, false)) {
-				teleported = true;
-				Teleport(appropriatePos);
-			}
-		}
+	if (CTimer::GetTimeInMilliseconds() <= ped->m_nWaitTimer
+		&& !ped->bGotUpOfMyOwnAccord && !ped->bFleeWhenStanding && !ped->m_threatEx) {
+		ped->m_pNextPathNode = nil;
+		ped->bFleeWhenStanding = true;
+		ped->m_threatEx = FindPlayerPed();
+		ped->SetGetUp();
+		ped->ClearWaitState();
 	}
-	m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 3000;
-	return teleported;
+	ped->m_nWaitTimer = 0;
+	ped->RestoreHeadingRate();
+	ped->Wait();
 }
 
 // --MIAMI: Done
-bool
-CPed::WarpPedToNearLeaderOffScreen(void)
+void
+CPed::FinishedWaitCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
-	bool teleported = false;
-	if (GetIsOnScreen() || m_leaveCarTimer > CTimer::GetTimeInMilliseconds())
-		return false;
+	CPed *ped = (CPed*)arg;
 
-	CVector warpToPos = m_leader->GetPosition();
-	CVector distVec = warpToPos - GetPosition();
-	float halfOfDist = distVec.Magnitude() * 0.5f;
-	CVector halfNormalizedDist = distVec / halfOfDist;
-
-	CVector appropriatePos = GetPosition();
-	int tryCount = Min(10, (int)halfOfDist);
-	for (int i = 0; i < tryCount; ++i) {
-		appropriatePos += halfNormalizedDist;
-		CVector zCorrectedPos = appropriatePos;
-		CPedPlacement::FindZCoorForPed(&zCorrectedPos);
-
-		if (Abs(zCorrectedPos.z - warpToPos.z) < 3.0f || Abs(zCorrectedPos.z - appropriatePos.z) < 3.0f) {
-			appropriatePos.z = zCorrectedPos.z;
-			if (!TheCamera.IsSphereVisible(appropriatePos, 0.6f)
-				&& CWorld::GetIsLineOfSightClear(appropriatePos, warpToPos, true, true, false, true, false, false, false)
-				&& !CWorld::TestSphereAgainstWorld(appropriatePos, 0.6f, this, true, true, false, true, false, false)) {
-				teleported = true;
-				Teleport(appropriatePos);
-			}
-		}
-	}
-	m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 3000;
-	return teleported;
+	ped->m_nWaitTimer = 0;
+	ped->RestoreHeadingRate();
+	ped->Wait();
 }
 
 // --MIAMI: Done
 void
-CPed::SetCarJack_AllClear(CVehicle* car, uint32 doorNode, uint32 doorFlag)
+CPed::RestoreHeadingRate(void)
 {
-	if (m_nPedState != PED_SEEK_CAR)
-		SetStoredState();
-
-	m_pSeekTarget = car;
-	m_pSeekTarget->RegisterReference((CEntity**)&m_pSeekTarget);
-	SetPedState(PED_CARJACK);
-	car->bIsBeingCarJacked = true;
-	m_pMyVehicle = (CVehicle*)m_pSeekTarget;
-	m_pMyVehicle->RegisterReference((CEntity**)&m_pMyVehicle);
-	((CVehicle*)m_pSeekTarget)->m_nNumGettingIn++;
-
-	if (m_nPedType == PEDTYPE_COP)
-		Say(SOUND_PED_ARREST_COP);
-	else if (car->m_nDoorLock == CARLOCK_UNLOCKED)
-		Say(SOUND_PED_CAR_JACKING, 1000);
-
-	CVector carEnterPos;
-	carEnterPos = GetPositionToOpenCarDoor(car, m_vehEnterType);
-
-	car->m_nGettingInFlags |= doorFlag;
-	m_vecOffsetSeek = carEnterPos - GetPosition();
-	m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 600;
-
-	if(car->IsBike()){
-		bUsesCollision = false;
-		PedAnimAlignCB(nil, this);
-	} else {
-		float zDiff = Max(0.0f, carEnterPos.z - GetPosition().z);
-		bUsesCollision = false;
+	m_headingRate = m_pedStats->m_headingChangeRate;
+}
 
-		if (m_vehEnterType == CAR_DOOR_LF || m_vehEnterType == CAR_DOOR_LR)
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, zDiff > 4.4f ? ANIM_CAR_ALIGNHI_LHS : ANIM_CAR_ALIGN_LHS, 4.0f);
-		else
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, zDiff > 4.4f ? ANIM_CAR_ALIGNHI_RHS : ANIM_CAR_ALIGN_RHS, 4.0f);
+// --MIAMI: Done
+void
+CPed::RestoreHeadingRateCB(CAnimBlendAssociation *assoc, void *arg)
+{
+	((CPed*)arg)->RestoreHeadingRate();
+}
 
-		m_pVehicleAnim->SetFinishCallback(PedAnimAlignCB, this);
+// --MIAMI: Done
+void
+CPed::FlagToDestroyWhenNextProcessed(void)
+{
+	bRemoveFromWorld = true;
+	if (!InVehicle())
+		return;
+	if (m_pMyVehicle->pDriver == this){
+		m_pMyVehicle->pDriver = nil;
+		if (IsPlayer() && m_pMyVehicle->GetStatus() != STATUS_WRECKED)
+			m_pMyVehicle->SetStatus(STATUS_ABANDONED);
+	}else{
+		m_pMyVehicle->RemovePassenger(this);
 	}
+	bInVehicle = false;
+	m_pMyVehicle = nil;
+
+	if (CharCreatedBy == MISSION_CHAR)
+		SetPedState(PED_DEAD);
+	else
+		SetPedState(PED_NONE);
+	m_pVehicleAnim = nil;
 }
 
 // --MIAMI: Done
 void
-CPed::SetCarJack(CVehicle* car)
+CPed::SetSolicit(uint32 time)
 {
-	uint8 doorFlag;
-	eDoors door;
-	CPed *pedInSeat = nil;
-
-	if (car->IsBoat())
+	if (m_nPedState == PED_SOLICIT || !IsPedInControl() || !m_carInObjective)
 		return;
 
-	if (car->IsBike()) {
-		switch (m_vehEnterType) {
-			case CAR_DOOR_RF:
-				doorFlag = CAR_DOOR_FLAG_LF | CAR_DOOR_FLAG_RF;
-				door = DOOR_FRONT_RIGHT;
-				pedInSeat = car->pDriver;
-				break;
-			case CAR_DOOR_RR:
-				doorFlag = CAR_DOOR_FLAG_LR | CAR_DOOR_FLAG_RR;
-				door = DOOR_REAR_RIGHT;
-				pedInSeat = car->pPassengers[0];
-				break;
-			case CAR_DOOR_LF:
-			case CAR_WINDSCREEN:
-				doorFlag = CAR_DOOR_FLAG_LF | CAR_DOOR_FLAG_RF;
-				door = DOOR_FRONT_LEFT;
-				pedInSeat = car->pDriver;
-				break;
-			case CAR_DOOR_LR:
-				doorFlag = CAR_DOOR_FLAG_LR | CAR_DOOR_FLAG_RR;
-				door = DOOR_REAR_LEFT;
-				pedInSeat = car->pPassengers[0];
-				break;
-			default:
-				doorFlag = CAR_DOOR_FLAG_UNKNOWN;
-				break;
-		}
-	} else {
-		switch (m_vehEnterType) {
-			case CAR_DOOR_RF:
-				doorFlag = CAR_DOOR_FLAG_RF;
-				door = DOOR_FRONT_RIGHT;
-				if (car->pPassengers[0]) {
-					pedInSeat = car->pPassengers[0];
-				}
-				else if (m_nPedType == PEDTYPE_COP) {
-					pedInSeat = car->pDriver;
-				}
-				break;
-			case CAR_DOOR_RR:
-				doorFlag = CAR_DOOR_FLAG_RR;
-				door = DOOR_REAR_RIGHT;
-				pedInSeat = car->pPassengers[2];
-				break;
-			case CAR_DOOR_LF:
-				doorFlag = CAR_DOOR_FLAG_LF;
-				door = DOOR_FRONT_LEFT;
-				pedInSeat = car->pDriver;
-				break;
-			case CAR_DOOR_LR:
-				doorFlag = CAR_DOOR_FLAG_LR;
-				door = DOOR_REAR_LEFT;
-				pedInSeat = car->pPassengers[1];
-				break;
-			default:
-				doorFlag = CAR_DOOR_FLAG_UNKNOWN;
-				break;
+	if (CharCreatedBy != MISSION_CHAR && m_carInObjective->m_nNumGettingIn == 0
+		&& CTimer::GetTimeInMilliseconds() < m_objectiveTimer) {
+		if (m_vehEnterType == CAR_DOOR_LF) {
+			m_fRotationDest = m_carInObjective->GetForward().Heading() - HALFPI;
+		} else {
+			m_fRotationDest = m_carInObjective->GetForward().Heading() + HALFPI;
 		}
-	}
 
-	if(car->bIsBus)
-		pedInSeat = car->pDriver;
+		if (Abs(m_fRotationDest - m_fRotationCur) < HALFPI) {
+			m_standardTimer = CTimer::GetTimeInMilliseconds() + time;
 
-	if (m_fHealth > 0.0f && (IsPlayer() || m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS ||
-					CharCreatedBy == MISSION_CHAR ||  (car->VehicleCreatedBy != MISSION_VEHICLE && car->GetModelIndex() != MI_DODO)))
-		if (pedInSeat && !pedInSeat->IsPedDoingDriveByShooting() && pedInSeat->m_nPedState == PED_DRIVING)
-			if (m_nPedState != PED_CARJACK && !m_pVehicleAnim)
-				if ((car->IsDoorReady(door) || car->IsDoorFullyOpen(door)))
-					if (!car->bIsBeingCarJacked && !(doorFlag & car->m_nGettingInFlags) && !(doorFlag & car->m_nGettingOutFlags))
-						SetCarJack_AllClear(car, m_vehEnterType, doorFlag);
+			if(!m_carInObjective->bIsVan && !m_carInObjective->bIsBus)
+				m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_HOOKERTALK, 4.0f);
+
+			SetPedState(PED_SOLICIT);
+		}
+	}
 }
 
 // --MIAMI: Done
@@ -19692,463 +9111,500 @@ CPed::Solicit(void)
 
 // --MIAMI: Done
 void
-CPed::SetExitBoat(CVehicle *boat)
+CPed::SetBuyIceCream(void)
 {
-	SetPedState(PED_IDLE);
-	CVector newPos = GetPosition();
-	RemoveInCarAnims();
-	CColModel* boatCol = boat->GetColModel();
-	if (boat->IsUpsideDown()) {
-		newPos = { 0.0f, 0.0f, boatCol->boundingBox.min.z };
-		newPos = boat->GetMatrix() * newPos;
-		newPos.z += 1.0f;
-		m_vehEnterType = CAR_DOOR_RF;
-		PedSetOutCarCB(nil, this);
-		bIsStanding = true;
-		m_pCurSurface = boat;
-		m_pCurSurface->RegisterReference((CEntity**)&m_pCurSurface);
-		m_pCurrentPhysSurface = boat;
-	} else {
-		if (boat->m_modelIndex == MI_SKIMMER) {
-			if (!boat->bIsInWater) {
-				m_vehEnterType = CAR_DOOR_RF;
-				PedSetOutCarCB(nil, this);
-				bIsStanding = true;
-				SetMoveState(PEDMOVE_STILL);
-				bTryingToReachDryLand = true;
-				float upMult = 1.04f + boatCol->boundingBox.min.z;
-				float rightMult = 0.6f * boatCol->boundingBox.max.x;
-				newPos = upMult * boat->GetUp() + rightMult * boat->GetRight() + boat->GetPosition();
-				SetPosition(newPos);
-				if (m_pMyVehicle) {
-					PositionPedOutOfCollision();
-				} else {
-					m_pMyVehicle = boat;
-					PositionPedOutOfCollision();
-					m_pMyVehicle = nil;
-				}
-				return;
-			}
+	if (m_nPedState == PED_BUY_ICECREAM || !IsPedInControl())
+		return;
 
-			newPos.z += 2.0f;
-		}
-		m_vehEnterType = CAR_DOOR_RF;
-		PedSetOutCarCB(nil, this);
-		bIsStanding = true;
-		m_pCurSurface = boat;
-		m_pCurSurface->RegisterReference((CEntity**)&m_pCurSurface);
-		m_pCurrentPhysSurface = boat;
-		CColPoint foundCol;
-		CEntity *foundEnt = nil;
-		if (CWorld::ProcessVerticalLine(newPos, newPos.z - 1.4f, foundCol, foundEnt, false, true, false, false, false, false, nil))
-			newPos.z = FEET_OFFSET + foundCol.point.z;
-	}
-	SetPosition(newPos);
-	SetMoveState(PEDMOVE_STILL);
-	m_vecMoveSpeed = boat->m_vecMoveSpeed;
+	if (!m_carInObjective)
+		return;
+
+	SetPedState(PED_BUY_ICECREAM);
 }
 
 // --MIAMI: Done
 void
-CPed::SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float heading, float time, int32 qid)
+CPed::BuyIceCream(void)
 {
-	if (!m_attractor)
-		m_attractor = pAttractor;
-	if (m_attractor != pAttractor)
-		return;
-	switch (pAttractor->GetEffect()->pedattr.type) {
-	case ATTRACTOR_ATM: SetObjective(OBJECTIVE_GOTO_ATM_ON_FOOT, heading, pos); break;
-	case ATTRACTOR_SEAT: SetObjective(OBJECTIVE_GOTO_SEAT_ON_FOOT, heading, pos); break;
-	case ATTRACTOR_STOP: SetObjective(OBJECTIVE_GOTO_BUS_STOP_ON_FOOT, heading, pos); break;
-	case ATTRACTOR_PIZZA: SetObjective(OBJECTIVE_GOTO_PIZZA_ON_FOOT, heading, pos); break;
-	case ATTRACTOR_SHELTER: SetObjective(OBJECTIVE_GOTO_SHELTER_ON_FOOT, heading, pos); break;
-	case ATTRACTOR_ICECREAM: SetObjective(OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT, heading, pos); break;
-	default: return;
+	if (m_carInObjective) {
+		CPed *driver = m_carInObjective->pDriver;
+		if (driver && CTimer::GetTimeInMilliseconds() > m_standardTimer) {
+			SetChat(driver, 8000);
+			driver->SetChat(this, 8000);
+			return;
+		}
+		SetObjective(OBJECTIVE_NONE);
+		SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
+	} else {
+		SetObjective(OBJECTIVE_NONE);
+		SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
 	}
-	SetObjectiveTimer(time);
-	m_positionInQueue = qid;
 }
 
 // --MIAMI: Done
-void
-CPed::ClearWaitState(void)
+bool
+CPed::PossiblyFindBetterPosToSeekCar(CVector *pos, CVehicle *veh)
 {
-	CAnimBlendAssociation *assoc;
-	switch (m_nWaitState) {
-		case WAITSTATE_PLAYANIM_CHAT:
-		case WAITSTATE_SIT_DOWN:
-		case WAITSTATE_SIT_DOWN_RVRS:
-		case WAITSTATE_SIT_UP:
-		case WAITSTATE_SIT_IDLE:
-		case WAITSTATE_USE_ATM:
-			if (CTimer::GetTimeInMilliseconds() <= m_nWaitTimer) {
-				if (m_nWaitState == WAITSTATE_USE_ATM) {
-					assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ATM);
-					if (assoc)
-						assoc->blendDelta = -8.0f;
-					if (m_attractor)
-						GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+	bool foundIt = false;
 
-				} else if (m_nWaitState == WAITSTATE_PLAYANIM_CHAT) {
-					assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_CHAT);
-					if (assoc)
-						assoc->blendDelta = -8.0f;
-					if (m_attractor)
-						GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+	CVector helperPos = GetPosition();
+	helperPos.z = pos->z - 0.5f;
 
-				} else if (m_nWaitState == WAITSTATE_SIT_DOWN || m_nWaitState == WAITSTATE_SIT_DOWN_RVRS || m_nWaitState == WAITSTATE_SIT_IDLE || m_nWaitState == WAITSTATE_SIT_UP) {
-					switch (m_nWaitState) {
-						case WAITSTATE_SIT_DOWN:
-							assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SEAT_DOWN);
-							if (assoc)
-								assoc->blendDelta = -8.0f;
-							break;
-						case WAITSTATE_SIT_IDLE:
-							assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SEAT_IDLE);
-							if (assoc)
-								assoc->blendDelta = -8.0f;
-							break;
-						case WAITSTATE_SIT_UP:
-							assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SEAT_UP);
-							if (assoc)
-								assoc->blendDelta = -8.0f;
-							break;
-						default:
-							break;
-					}
-					if (m_attractor)
-						GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
-				}
-			}
-			break;
-		case WAITSTATE_RIOT:
-		{
-			CAnimBlock* riotAnimBlock = CAnimManager::GetAnimationBlock("riot");
+	CVector foundPos = *pos;
+	foundPos.z -= 0.5f;
 
-			for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
-				int first = riotAnimBlock->firstIndex;
-				int index = assoc->hierarchy - CAnimManager::GetAnimation(0);
-				if (index >= first && index < first + riotAnimBlock->numAnims) {
-					assoc->blendDelta = -1000.0f;
-				}
-			}
-			break;
-		}
-		case WAITSTATE_FAST_FALL:
-			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_KO_SKID_FRONT))
-				SetGetUp();
+	// If there is another car between target car and us.
+	if (CWorld::TestSphereAgainstWorld((foundPos + helperPos) / 2.0f, 0.25f, veh, false, true, false, false, false, false)) {
 
-			break;
-		case WAITSTATE_BOMBER:
-			assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BOMBER);
-			if (assoc)
-				assoc->blendDelta = -8.0f;
-			break;
-		case WAITSTATE_STRIPPER:
-		{
-			CAnimBlock* stripAnimBlock = CAnimManager::GetAnimationBlock("strip");
+		CColModel *vehCol = veh->GetModelInfo()->GetColModel();
+		CVector *colMin = &vehCol->boundingBox.min;
+		CVector *colMax = &vehCol->boundingBox.max;
 
-			for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
-				int first = stripAnimBlock->firstIndex;
-				int index = assoc->hierarchy - CAnimManager::GetAnimation(0);
-				if (index >= first && index < first + stripAnimBlock->numAnims) {
-					assoc->blendDelta = -1000.0f;
-				}
-			}
-			break;
-		}
-		case WAITSTATE_LANCESITTING:
-			assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SUNBATHE);
-			if (assoc)
-				assoc->blendDelta = -8.0f;
-			break;
-		case WAITSTATE_PLAYANIM_HANDSUP_SIMPLE:
-			assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_HANDSUP);
-			if (assoc)
-				assoc->blendDelta = -8.0f;
-			break;
-		default:
-			break;
-	}
-	m_nWaitState = WAITSTATE_FALSE;
-}
+		CVector leftRearPos = CVector(colMin->x - 0.5f, colMin->y - 0.5f, 0.0f);
+		CVector rightRearPos = CVector(0.5f + colMax->x, colMin->y - 0.5f, 0.0f);
+		CVector leftFrontPos = CVector(colMin->x - 0.5f, 0.5f + colMax->y, 0.0f);
+		CVector rightFrontPos = CVector(0.5f + colMax->x, 0.5f + colMax->y, 0.0f);
 
-#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));
-void
-CPed::Save(uint8*& buf)
-{
-	SkipSaveBuf(buf, 52);
-	CopyToBuf(buf, GetPosition().x);
-	CopyToBuf(buf, GetPosition().y);
-	CopyToBuf(buf, GetPosition().z);
-	SkipSaveBuf(buf, 288);
-	CopyToBuf(buf, CharCreatedBy);
-	SkipSaveBuf(buf, 499);
-	CopyToBuf(buf, m_fHealth);
-	CopyToBuf(buf, m_fArmour);
-	SkipSaveBuf(buf, 172);
-	for (int i = 0; i < 10; i++) // has to be hardcoded
-		m_weapons[i].Save(buf);
-	SkipSaveBuf(buf, 252);
-}
+		leftRearPos = veh->GetMatrix() * leftRearPos;
+		rightRearPos = veh->GetMatrix() * rightRearPos;
+		leftFrontPos = veh->GetMatrix() * leftFrontPos;
+		rightFrontPos = veh->GetMatrix() * rightFrontPos;
 
-void
-CPed::Load(uint8*& buf)
-{
-	SkipSaveBuf(buf, 52);
-	CopyFromBuf(buf, GetMatrix().GetPosition().x);
-	CopyFromBuf(buf, GetMatrix().GetPosition().y);
-	CopyFromBuf(buf, GetMatrix().GetPosition().z);
-	SkipSaveBuf(buf, 288);
-	CopyFromBuf(buf, CharCreatedBy);
-	SkipSaveBuf(buf, 499);
-	CopyFromBuf(buf, m_fHealth);
-	CopyFromBuf(buf, m_fArmour);
-	SkipSaveBuf(buf, 172);
-	m_currentWeapon = WEAPONTYPE_UNARMED;
+		// Makes helperPos veh-ped distance vector.
+		helperPos -= veh->GetPosition();
 
-	CWeapon bufWeapon;
-	for (int i = 0; i < 10; i++) { // has to be hardcoded
-		bufWeapon.Load(buf);
+		// ?!? I think it's absurd to use this unless another function like SeekCar finds next pos. with it and we're trying to simulate it's behaviour.
+		// On every run it returns another pos. for ped, with same distance to the veh.
+		// Sequence of positions are not guaranteed, it depends on global pos. (So sometimes it returns positions to make ped draw circle, sometimes don't)
+		helperPos = veh->GetMatrix() * helperPos;
 
-		if (bufWeapon.m_eWeaponType != WEAPONTYPE_UNARMED) {
-			int modelId = CWeaponInfo::GetWeaponInfo(bufWeapon.m_eWeaponType)->m_nModelId;
-			if (modelId != -1) {
-				CStreaming::RequestModel(modelId, STREAMFLAGS_DEPENDENCY);
-				int modelId2 = CWeaponInfo::GetWeaponInfo(bufWeapon.m_eWeaponType)->m_nModel2Id;
-				if (modelId2 != -1)
-					CStreaming::RequestModel(modelId2, STREAMFLAGS_DEPENDENCY);
+		float vehForwardHeading = veh->GetForward().Heading();
 
-				CStreaming::LoadAllRequestedModels(false);
+		// I'm absolutely not sure about these namings.
+		// NTVF = needed turn if we're looking to vehicle front and wanna look to...
+
+		float potentialLrHeading = Atan2(leftRearPos.x - helperPos.x, leftRearPos.y - helperPos.y);
+		float NTVF_LR = CGeneral::LimitRadianAngle(potentialLrHeading - vehForwardHeading);
+
+		float potentialRrHeading = Atan2(rightRearPos.x - helperPos.x, rightRearPos.y - helperPos.y);
+		float NTVF_RR = CGeneral::LimitRadianAngle(potentialRrHeading - vehForwardHeading);
+
+		float potentialLfHeading = Atan2(leftFrontPos.x - helperPos.x, leftFrontPos.y - helperPos.y);
+		float NTVF_LF = CGeneral::LimitRadianAngle(potentialLfHeading - vehForwardHeading);
+
+		float potentialRfHeading = Atan2(rightFrontPos.x - helperPos.x, rightFrontPos.y - helperPos.y);
+		float NTVF_RF = CGeneral::LimitRadianAngle(potentialRfHeading - vehForwardHeading);
+
+		bool canHeadToLr = NTVF_LR <= -PI || NTVF_LR >= -HALFPI;
+
+		bool canHeadToRr = NTVF_RR <= HALFPI || NTVF_RR >= PI;
+
+		bool canHeadToLf = NTVF_LF >= 0.0f || NTVF_LF <= -HALFPI;
+
+		bool canHeadToRf = NTVF_RF <= 0.0f || NTVF_RF >= HALFPI;
+
+		// Only order of conditions are different among enterTypes.
+		if (m_vehEnterType == CAR_DOOR_RR) {
+			if (canHeadToRr) {
+				foundPos = rightRearPos;
+				foundIt = true;
+			} else if (canHeadToRf) {
+				foundPos = rightFrontPos;
+				foundIt = true;
+			} else if (canHeadToLr) {
+				foundPos = leftRearPos;
+				foundIt = true;
+			} else if (canHeadToLf) {
+				foundPos = leftFrontPos;
+				foundIt = true;
+			}
+		} else if(m_vehEnterType == CAR_DOOR_RF) {
+			if (canHeadToRf) {
+				foundPos = rightFrontPos;
+				foundIt = true;
+			} else if (canHeadToRr) {
+				foundPos = rightRearPos;
+				foundIt = true;
+			} else if (canHeadToLf) {
+				foundPos = leftFrontPos;
+				foundIt = true;
+			} else if (canHeadToLr) {
+				foundPos = leftRearPos;
+				foundIt = true;
+			}
+		} else if (m_vehEnterType == CAR_DOOR_LF) {
+			if (canHeadToLf) {
+				foundPos = leftFrontPos;
+				foundIt = true;
+			} else if (canHeadToLr) {
+				foundPos = leftRearPos;
+				foundIt = true;
+			} else if (canHeadToRf) {
+				foundPos = rightFrontPos;
+				foundIt = true;
+			} else if (canHeadToRr) {
+				foundPos = rightRearPos;
+				foundIt = true;
+			}
+		} else if (m_vehEnterType == CAR_DOOR_LR) {
+			if (canHeadToLr) {
+				foundPos = leftRearPos;
+				foundIt = true;
+			} else if (canHeadToLf) {
+				foundPos = leftFrontPos;
+				foundIt = true;
+			} else if (canHeadToRr) {
+				foundPos = rightRearPos;
+				foundIt = true;
+			} else if (canHeadToRf) {
+				foundPos = rightFrontPos;
+				foundIt = true;
 			}
-			GiveWeapon(bufWeapon.m_eWeaponType, bufWeapon.m_nAmmoTotal, false);
 		}
 	}
-	SkipSaveBuf(buf, 252);
+	if (!foundIt)
+		return false;
+
+	helperPos = GetPosition() - foundPos;
+	helperPos.z = 0.0f;
+	if (helperPos.MagnitudeSqr() <= sq(0.5f))
+		return false;
+
+	pos->x = foundPos.x;
+	pos->y = foundPos.y;
+	return true;
 }
-#undef CopyFromBuf
-#undef CopyToBuf
-#endif
 
 // --MIAMI: Done
 void
-CPed::GiveDelayedWeapon(eWeaponType weapon, uint32 ammo)
+CPed::SetLeader(CEntity *leader)
 {
-	m_delayedWeapon = weapon;
-	m_delayedWeaponAmmo = ammo;
-	if (m_delayedWeapon != WEAPONTYPE_UNIDENTIFIED) {
-		int modelId1 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModelId;
-		int modelId2 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModel2Id;
-		if (modelId1 != -1)
-			CStreaming::RequestModel(modelId1, STREAMFLAGS_DEPENDENCY);
-		if (modelId2 != -1)
-			CStreaming::RequestModel(modelId2, STREAMFLAGS_DEPENDENCY);
+	m_leader = (CPed*)leader;
 
-		if ((modelId1 == -1 || CStreaming::HasModelLoaded(modelId1))
-			&& (modelId2 == -1 || CStreaming::HasModelLoaded(modelId2))) {
-			GiveWeapon(m_delayedWeapon, m_delayedWeaponAmmo, true);
-			m_delayedWeapon = WEAPONTYPE_UNIDENTIFIED;
-		}
+	if (m_leader) {
+		m_leader->bIsLeader = true;
+		m_leader->RegisterReference((CEntity**)&m_leader);
 	}
 }
 
 // --MIAMI: Done
-void
-CPed::RequestDelayedWeapon()
+bool
+CPed::CanPedJumpThis(CEntity *unused, CVector *damageNormal)
 {
-	if (m_delayedWeapon != WEAPONTYPE_UNIDENTIFIED) {
-		int modelId1 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModelId;
-		int modelId2 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModel2Id;
-		if (modelId1 != -1)
-			CStreaming::RequestModel(modelId1, STREAMFLAGS_DEPENDENCY);
-		if (modelId2 != -1)
-			CStreaming::RequestModel(modelId2, STREAMFLAGS_DEPENDENCY);
+	if (m_nSurfaceTouched == SURFACE_WATER)
+		return true;
 
-		if ((modelId1 == -1 || CStreaming::HasModelLoaded(modelId1))
-			&& (modelId2 == -1 || CStreaming::HasModelLoaded(modelId2))) {
-			GiveWeapon(m_delayedWeapon, m_delayedWeaponAmmo, 1);
-			m_delayedWeapon = WEAPONTYPE_UNIDENTIFIED;
+	CVector pos = GetPosition();
+	CVector forwardOffset = GetForward();
+	if (damageNormal && damageNormal->z > 0.17f) {
+		if (damageNormal->z > 0.9f)
+			return false;
+
+		CColModel *ourCol = GetColModel();
+		pos.z = ourCol->spheres->center.z - ourCol->spheres->radius * damageNormal->z + pos.z;
+		pos.z = pos.z + 0.05f;
+		float collPower = damageNormal->Magnitude2D();
+		if (damageNormal->z > 0.5f) {
+			CVector invDamageNormal(-damageNormal->x, -damageNormal->y, 0.0f);
+			invDamageNormal *= 1.0f / collPower;
+			CVector estimatedJumpDist = invDamageNormal + collPower * invDamageNormal * ourCol->spheres->radius;
+			forwardOffset = estimatedJumpDist * Min(2.0f / collPower, 4.0f);
+		} else {
+			forwardOffset += collPower * ourCol->spheres->radius * forwardOffset;
 		}
+	} else {
+		pos.z -= 0.15f;
 	}
+
+	CVector forwardPos = pos + forwardOffset;
+	return CWorld::GetIsLineOfSightClear(pos, forwardPos, true, false, false, true, false, false, false);
 }
 
 // --MIAMI: Done
 void
-CPed::ClearFollowPath()
+CPed::SetJump(void)
 {
-	for (int i = 0; i < ARRAY_SIZE(m_pathNodesToGo); i++) {
-		m_pathNodesToGo[i] = nil;
+	if (!bInVehicle && m_nPedState != PED_JUMP && !RpAnimBlendClumpGetAssociation(GetClump(), ANIM_JUMP_LAUNCH) &&
+		(m_nSurfaceTouched != SURFACE_STEEP_CLIFF || DotProduct(GetForward(), m_vecDamageNormal) >= 0.0f)) {
+
+		SetStoredState();
+		SetPedState(PED_JUMP);
+		CAnimBlendAssociation *jumpAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_JUMP_LAUNCH, 8.0f);
+		jumpAssoc->SetFinishCallback(FinishLaunchCB, this);
+		m_fRotationDest = m_fRotationCur;
 	}
-	m_nNumPathNodes = 0;
-	m_nCurPathNodeId = 0;
 }
 
 // --MIAMI: Done
 void
-CPed::AddInCarAnims(CVehicle* car, bool isDriver)
+CPed::FinishLaunchCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
-	if (car->IsBoat()) {
-		if (car->pHandling->Flags & HANDLING_SIT_IN_BOAT) {
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f);
-		} else {
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT, 100.0f);
+	CPed *ped = (CPed*)arg;
+
+	if (ped->m_nPedState != PED_JUMP)
+		return;
+
+	CVector forward(0.09f * ped->GetForward() + ped->GetPosition());
+	forward.z += CModelInfo::GetModelInfo(ped->GetModelIndex())->GetColModel()->spheres[2].center.z + 0.35f;
+
+	CEntity *obstacle = CWorld::TestSphereAgainstWorld(forward, 0.25f, nil, true, true, false, true, false, false);
+	if (!obstacle) {
+		// Forward of forward
+		forward += 0.15f * ped->GetForward();
+		forward.z += 0.15f;
+		obstacle = CWorld::TestSphereAgainstWorld(forward, 0.25f, nil, true, true, false, true, false, false);
+	}
+
+	if (!obstacle && CCullZones::CamStairsForPlayer() && CCullZones::FindZoneWithStairsAttributeForPlayer())
+		obstacle = ped;
+
+	if (obstacle) {
+		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+		CAnimBlendAssociation *handsCoverAssoc = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_HIT_WALL, 8.0f);
+		handsCoverAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
+		handsCoverAssoc->SetFinishCallback(FinishHitHeadCB, ped);
+		ped->bIsLanding = true;
+		return;
+	}
+
+	float velocityFromAnim = 0.1f;
+	CAnimBlendAssociation *sprintAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), ANIM_SPRINT);
+
+	if (sprintAssoc) {
+		velocityFromAnim = 0.05f * sprintAssoc->blendAmount + 0.17f;
+	} else {
+		CAnimBlendAssociation *runAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), ANIM_RUN);
+		if (runAssoc) {
+			velocityFromAnim = 0.07f * runAssoc->blendAmount + 0.1f;
 		}
-	} else if (car->IsBike()) {
-		if (isDriver) {
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ((CBike*)car)->m_bikeAnimType, ANIM_BIKE_RIDE, 100.0f);
+	}
+
+	if (ped->IsPlayer() || ped->m_pedInObjective && ped->m_pedInObjective->IsPlayer())
+		ped->ApplyMoveForce(0.0f, 0.0f, 8.5f);
+	else
+		ped->ApplyMoveForce(0.0f, 0.0f, 4.5f);
+	
+	if (sq(velocityFromAnim) > ped->m_vecMoveSpeed.MagnitudeSqr2D() || ped->m_pCurrentPhysSurface) {
+
+#ifdef FREE_CAM
+		if (TheCamera.Cams[0].Using3rdPersonMouseCam() && !CCamera::bFreeCam) {
+#else
+		if (TheCamera.Cams[0].Using3rdPersonMouseCam()) {
+#endif
+			float fpsAngle = ped->WorkOutHeadingForMovingFirstPerson(ped->m_fRotationCur);
+			ped->m_vecMoveSpeed.x = -velocityFromAnim * Sin(fpsAngle);
+			ped->m_vecMoveSpeed.y = velocityFromAnim * Cos(fpsAngle);
 		} else {
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ((CBike*)car)->m_bikeAnimType, ANIM_BIKE_PASSENGER, 100.0f);
+			ped->m_vecMoveSpeed.x = -velocityFromAnim * Sin(ped->m_fRotationCur);
+			ped->m_vecMoveSpeed.y = velocityFromAnim * Cos(ped->m_fRotationCur);
 		}
-	} else {
-		if (isDriver) {
-			if (car->bLowVehicle) {
-				m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_LSIT, 100.0f);
-			} else {
-				m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f);
-			}
-		} else {
-			if (car->bLowVehicle) {
-				m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SITPLO, 100.0f);
-			} else {
-				m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SITP, 100.0f);
-			}
+
+		if (ped->m_pCurrentPhysSurface) {
+			ped->m_vecMoveSpeed.x += ped->m_pCurrentPhysSurface->m_vecMoveSpeed.x;
+			ped->m_vecMoveSpeed.y += ped->m_pCurrentPhysSurface->m_vecMoveSpeed.y;
 		}
 	}
 
-	StopNonPartialAnims();
-}
+	ped->bIsStanding = false;
+	ped->bIsInTheAir = true;
+	animAssoc->blendDelta = -1000.0f;
+	CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_JUMP_GLIDE);
 
-// --MIAMI: Done
-bool
-CPed::CanBeDamagedByThisGangMember(CPed* who)
-{
-	return m_gangFlags & (1 << (who->m_nPedType - PEDTYPE_GANG1));
+	if (ped->bDoBloodyFootprints) {
+		CVector bloodPos(0.0f, 0.0f, 0.0f);
+		ped->TransformToNode(bloodPos, PED_FOOTL);
+
+		bloodPos.z -= 0.1f;
+		bloodPos += 0.2f * ped->GetForward();
+
+		CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &bloodPos,
+			0.26f * ped->GetForward().x,
+			0.26f * ped->GetForward().y,
+			0.14f * ped->GetRight().x,
+			0.14f * ped->GetRight().y,
+			255, 255, 0, 0, 4.0f, 3000, 1.0f);
+
+		bloodPos = CVector(0.0f, 0.0f, 0.0f);
+		ped->TransformToNode(bloodPos, PED_FOOTR);
+
+		bloodPos.z -= 0.1f;
+		bloodPos += 0.2f * ped->GetForward();
+		CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &bloodPos,
+			0.26f * ped->GetForward().x,
+			0.26f * ped->GetForward().y,
+			0.14f * ped->GetRight().x,
+			0.14f * ped->GetRight().y,
+			255, 255, 0, 0, 4.0f, 3000, 1.0f);
+
+		if (ped->m_bloodyFootprintCountOrDeathTime <= 40) {
+			ped->m_bloodyFootprintCountOrDeathTime = 0;
+			ped->bDoBloodyFootprints = false;
+		} else {
+			ped->m_bloodyFootprintCountOrDeathTime -= 40;
+		}
+	}
 }
 
 // --MIAMI: Done
 void
-CPed::Undress(const char* name)
+CPed::FinishJumpCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
-	int mi = GetModelIndex();
-	CAnimBlendAssociation* pAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_OUT);
-	if (pAnim)
-		FinishTalkingOnMobileCB(pAnim, this);
+	CPed *ped = (CPed*)arg;
 
-	DeleteRwObject();
-	if (IsPlayer())
-		mi = MI_PLAYER;
-	CStreaming::RequestSpecialModel(mi, name, STREAMFLAGS_DEPENDENCY | STREAMFLAGS_SCRIPTOWNED);
-	CWorld::Remove(this);
+	ped->bResetWalkAnims = true;
+	ped->bIsLanding = false;
+
+	animAssoc->blendDelta = -1000.0f;
 }
 
 // --MIAMI: Done
 void
-FinishTalkingOnMobileCB(CAnimBlendAssociation *assoc, void *arg)
+CPed::FinishHitHeadCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
 	CPed *ped = (CPed*)arg;
-	if (ped->m_storedWeapon != WEAPONTYPE_UNIDENTIFIED) {
-		ped->RemoveWeaponModel(MI_MOBILE);
-		ped->SetCurrentWeapon(ped->m_storedWeapon);
-		ped->m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
+
+	if (animAssoc) {
+		animAssoc->blendDelta = -4.0f;
+		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
 	}
-	ped->m_lookTimer = 0;
+
+	if (ped->m_nPedState == PED_JUMP)
+		ped->RestorePreviousState();
+
+	ped->bIsLanding = false;
 }
 
 // --MIAMI: Done
-void
-StartTalkingOnMobileCB(CAnimBlendAssociation* assoc, void* arg)
+bool
+CPed::CanPedDriveOff(void)
 {
-	CPed* ped = (CPed*)arg;
-	if (ped->m_nPedState == PED_ANSWER_MOBILE)
-		CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_PHONE_TALK, 4.0f);
-}
+	if (m_nPedState != PED_DRIVING || m_lookTimer > CTimer::GetTimeInMilliseconds())
+		return false;
 
+	for (int i = 0; i < m_numNearPeds; i++) {
+		CPed *nearPed = m_nearPeds[i];
+		if (nearPed->m_nPedType == m_nPedType && nearPed->m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && nearPed->m_carInObjective == m_carInObjective) {
+			m_lookTimer = CTimer::GetTimeInMilliseconds() + 1000;
+			return false;
+		}
+	}
+	return true;
+}
 // --MIAMI: Done
 void
-CPed::SetAnswerMobile(void)
+CPed::SetRadioStation(void)
 {
-	if (m_nPedState != PED_ANSWER_MOBILE && !DyingOrDead()) {
-		SetPedState(PED_ANSWER_MOBILE);
-		RemoveWeaponAnims(GetWeapon()->m_eWeaponType, -4.0f);
-		CAnimBlendAssociation *assoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_PHONE_IN, 4.0f);
-		assoc->SetFinishCallback(StartTalkingOnMobileCB, this);
-		m_lookTimer = INT32_MAX;
-		if (m_storedWeapon == WEAPONTYPE_UNIDENTIFIED)
-			m_storedWeapon = GetWeapon()->m_eWeaponType;
+	CPedModelInfo* modelInfo = (CPedModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
 
-		RemoveWeaponModel(-1);
+	if (IsPlayer() || !m_pMyVehicle || m_pMyVehicle->pDriver != this)
+		return;
+
+	if (GetModelIndex() != MI_PGA && GetModelIndex() != MI_PGB) {
+		if (m_pMyVehicle->m_nRadioStation != modelInfo->radio1 && m_pMyVehicle->m_nRadioStation != modelInfo->radio2) {
+			if (CGeneral::GetRandomTrueFalse())
+				m_pMyVehicle->m_nRadioStation = modelInfo->radio1;
+			else
+				m_pMyVehicle->m_nRadioStation = modelInfo->radio2;
+		}
+	} else {
+		m_pMyVehicle->m_nRadioStation = DMAudio.GetFavouriteRadioStation();
 	}
 }
 
 // --MIAMI: Done
 void
-CPed::ClearAnswerMobile(void)
+CPed::WarpPedIntoCar(CVehicle *car)
 {
-	if (m_nLastPedState == PED_ANSWER_MOBILE)
-		m_nLastPedState = PED_NONE;
+	bInVehicle = true;
+	m_pMyVehicle = car;
+	m_pMyVehicle->RegisterReference((CEntity **) &m_pMyVehicle);
+	m_carInObjective = car;
+	m_carInObjective->RegisterReference((CEntity **) &m_carInObjective);
+	SetPedState(PED_DRIVING);
+	bUsesCollision = false;
+	bIsInTheAir = false;
+	bVehExitWillBeInstant = true;
+	if (m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
+		car->SetDriver(this);
+		car->pDriver->RegisterReference((CEntity **) &car->pDriver);
 
-	if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_TALK)) {
-		CAnimBlendAssociation *assoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_PHONE_OUT, 8.0f);
-		assoc->SetFinishCallback(FinishTalkingOnMobileCB, this);
+	} else if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER) {
+		if (car->IsBike() && !car->pPassengers[0]) {
+			car->pPassengers[0] = this;
+			car->pPassengers[0]->RegisterReference((CEntity**) &car->pPassengers[0]);
+		}
+		for (int i = 0; i < 4; i++) {
+			if (!car->pPassengers[i]) {
+				car->pPassengers[i] = this;
+				car->pPassengers[i]->RegisterReference((CEntity **) &car->pPassengers[i]);
+				break;
+			}
+		}
 	} else
-		FinishTalkingOnMobileCB(nil, this);
+		return;
 
-	if (m_nPedState == PED_ANSWER_MOBILE) {
-		m_nPedState = PED_IDLE;
-		RestorePreviousState();
-		m_pVehicleAnim = nil;
+	if (IsPlayer()) {
+		car->SetStatus(STATUS_PLAYER);
+		AudioManager.PlayerJustGotInCar();
+		CCarCtrl::RegisterVehicleOfInterest(car);
+	} else {
+		car->SetStatus(STATUS_PHYSICS);
+	}
+
+	CWorld::Remove(this);
+	SetPosition(car->GetPosition());
+	CWorld::Add(this);
+
+	if (car->bIsAmbulanceOnDuty) {
+		car->bIsAmbulanceOnDuty = false;
+		--CCarCtrl::NumAmbulancesOnDuty;
+	}
+	if (car->bIsFireTruckOnDuty) {
+		car->bIsFireTruckOnDuty = false;
+		--CCarCtrl::NumFiretrucksOnDuty;
+	}
+	if (!car->bEngineOn) {
+		car->bEngineOn = true;
+		DMAudio.PlayOneShot(car->m_audioEntityId, SOUND_CAR_ENGINE_START, 1.0f);
 	}
+
+	RpAnimBlendClumpSetBlendDeltas(GetClump(), ASSOC_PARTIAL, -1000.0f);
+
+	AddInCarAnims(car, car->pDriver == this);
+	RemoveWeaponWhenEnteringVehicle();
+
+	if (car->bIsBus)
+		bRenderPedInCar = false;
+
+	bChangedSeat = true;
 }
 
 // --MIAMI: Done
-void
-CPed::Dress(void)
+bool
+CPed::HasAttractor(void)
 {
-	int mi = GetModelIndex();
-	m_modelIndex = -1;
-	SetModelIndex(mi);
-	m_nPedState = PED_IDLE;
-	m_nLastPedState = PED_NONE;
-	m_objective = OBJECTIVE_NONE;
-	m_prevObjective = OBJECTIVE_NONE;
-	m_nWaitState = WAITSTATE_FALSE;
-	CWorld::Add(this);
-	RestoreHeadingRate();
+	return m_attractor != nil;
 }
 
 // --MIAMI: Done
 void
-CPed::AnswerMobile(void)
+CPed::SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float heading, float time, int32 qid)
 {
-	if (!IsPedInControl())
+	if (!m_attractor)
+		m_attractor = pAttractor;
+	if (m_attractor != pAttractor)
 		return;
-
-	CAnimBlendAssociation *phoneInAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_IN);
-	CAnimBlendAssociation *phoneOutAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_OUT);
-	CAnimBlendAssociation *phoneTalkAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_TALK);
-	if (phoneInAssoc || phoneTalkAssoc || phoneOutAssoc) {
-		if (phoneInAssoc) {
-			if (phoneInAssoc->currentTime >= 0.85f && !m_pWeaponModel) {
-				CBaseModelInfo *phoneModel = CModelInfo::GetModelInfo(MI_MOBILE);
-				m_pWeaponModel = (RpAtomic*)phoneModel->CreateInstance();
-				phoneModel->AddRef();
-				m_wepModelID = MI_MOBILE;
-
-				// They copied AddWeaponModel and forgot that here
-				// bool unused = IsPlayer();
-			}
-		} else if (phoneOutAssoc) {
-			if (phoneOutAssoc->currentTime >= 0.5f && phoneOutAssoc->currentTime - phoneOutAssoc->timeStep < 0.5f) {
-				RemoveWeaponModel(MI_MOBILE);
-				SetCurrentWeapon(m_storedWeapon);
-				m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
-			}
-		}
-	} else {
-		CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_PHONE_TALK, 4.0f);
+	switch (pAttractor->GetEffect()->pedattr.type) {
+	case ATTRACTOR_ATM: SetObjective(OBJECTIVE_GOTO_ATM_ON_FOOT, heading, pos); break;
+	case ATTRACTOR_SEAT: SetObjective(OBJECTIVE_GOTO_SEAT_ON_FOOT, heading, pos); break;
+	case ATTRACTOR_STOP: SetObjective(OBJECTIVE_GOTO_BUS_STOP_ON_FOOT, heading, pos); break;
+	case ATTRACTOR_PIZZA: SetObjective(OBJECTIVE_GOTO_PIZZA_ON_FOOT, heading, pos); break;
+	case ATTRACTOR_SHELTER: SetObjective(OBJECTIVE_GOTO_SHELTER_ON_FOOT, heading, pos); break;
+	case ATTRACTOR_ICECREAM: SetObjective(OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT, heading, pos); break;
+	default: return;
 	}
+	SetObjectiveTimer(time);
+	m_positionInQueue = qid;
 }
 
 // --MIAMI: Done
@@ -20225,330 +9681,6 @@ CPed::DettachPedFromEntity(void)
 
 // --MIAMI: Done
 void
-CPed::PedShuffle(void)
-{
-	if (m_pMyVehicle->pPassengers[0] == this) {
-		CPed *driver = m_pMyVehicle->pDriver;
-		if (!driver || driver->m_objective == OBJECTIVE_LEAVE_CAR) {
-			m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, m_pMyVehicle->bLowVehicle ? ANIM_CAR_LSHUFFLE_RHS : ANIM_CAR_SHUFFLE_RHS);
-			m_objective = OBJECTIVE_ENTER_CAR_AS_DRIVER;
-			m_pMyVehicle->RemovePassenger(this);
-			bInVehicle = false;
-			m_pVehicleAnim->SetFinishCallback(PedSetInCarCB, this);
-		}
-	}
-}
-
-// --MIAMI: Done
-void
-CPed::DriveVehicle(void)
-{
-	if (bOffscreen)
-		return;
-
-	CVehicle *veh = m_pMyVehicle;
-	if (veh->IsBike()) {
-		CBike *bike = (CBike*)veh;
-		float blendDelta = 1.0f;
-		float targetUDLean = 0.0f;
-		CAnimBlendAssociation *leftAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_LEFT);
-		CAnimBlendAssociation *rightAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_RIGHT);
-		CAnimBlendAssociation *stillAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_STILL);
-		CAnimBlendAssociation *fwdAssoc, *backAssoc;
-		if (IsPlayer()) {
-			fwdAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_FWD);
-			backAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_BACK);
-		}
-		CAnimBlendAssociation *walkbackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_PUSHES);
-		CAnimBlendAssociation *drivebyAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_DRIVEBY_RHS);
-		if (!drivebyAssoc)
-			drivebyAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_DRIVEBY_LHS);
-		if (!drivebyAssoc)
-			drivebyAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_DRIVEBY_FT);
-
-		float velocityFwdDotProd = DotProduct(bike->m_vecMoveSpeed, bike->GetForward());
-		if (m_vecTurnSpeed.MagnitudeSqr() > 0.09f) {
-			bike->KnockOffRider(WEAPONTYPE_FALL, 2, this, false);
-			if (bike->pPassengers[0])
-				bike->KnockOffRider(WEAPONTYPE_FALL, 2, bike->pPassengers[0], false);
-			return;
-		}
-		if (!drivebyAssoc && Abs(velocityFwdDotProd) < 0.02f) {
-			if (!stillAssoc || stillAssoc->blendAmount < 1.0 && stillAssoc->blendDelta <= 0.0) {
-				stillAssoc = CAnimManager::BlendAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_STILL, 2.0f);
-			}
-		} else {
-			if (velocityFwdDotProd >= 0.0f) {
-				if (stillAssoc && stillAssoc->blendDelta >= 0.0f)
-					stillAssoc->blendDelta = -4.0f;
-				if (walkbackAssoc && walkbackAssoc->blendDelta >= 0.0f)
-					walkbackAssoc->blendDelta = -4.0f;
-			} else {
-				float maxReverseSpeed = bike->pHandling->Transmission.fMaxReverseVelocity;
-				if (3.5f * maxReverseSpeed > velocityFwdDotProd && (bike->m_nWheelsOnGround || bike->GetUp().z < -0.5f)) {
-					bike->KnockOffRider(WEAPONTYPE_FALL, 2, this, false);
-					if (bike->pPassengers[0])
-						bike->KnockOffRider(WEAPONTYPE_FALL, 2, bike->pPassengers[0], false);
-					return;
-				}
-				if (bike->m_fGasPedal >= 0.0 || velocityFwdDotProd <= maxReverseSpeed * 1.5) {
-					if (IsPlayer() && velocityFwdDotProd < maxReverseSpeed * 1.5)
-						targetUDLean = -1.0f;
-
-					if (stillAssoc && stillAssoc->blendDelta >= 0.0f)
-						stillAssoc->blendDelta = -4.0f;
-
-					if (walkbackAssoc && walkbackAssoc->blendDelta >= 0.0f) {
-						walkbackAssoc->blendDelta = -4.0f;
-					}
-				} else if (!walkbackAssoc || walkbackAssoc->blendAmount < 1.0f && walkbackAssoc->blendDelta <= 0.0f) {
-					walkbackAssoc = CAnimManager::BlendAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_PUSHES, 4.0f);
-				}
-			}
-		}
-		if (stillAssoc)
-			blendDelta -= Min(1.0f, CTimer::GetTimeStepNonClipped() * 0.02f * stillAssoc->blendDelta + stillAssoc->blendAmount);
-
-		if (drivebyAssoc)
-			blendDelta -= Min(blendDelta, CTimer::GetTimeStepNonClipped() * 0.02f * drivebyAssoc->blendDelta + drivebyAssoc->blendAmount);
-
-		if (walkbackAssoc)
-			blendDelta -= Min(blendDelta, CTimer::GetTimeStepNonClipped() * 0.02f * walkbackAssoc->blendDelta + walkbackAssoc->blendAmount);
-
-		float targetLRLean, timeBlend, neededAngForWheelie, stoppieAng;
-
-		// Smooth the lean amount
-		if (targetUDLean == -1.0f) {
-			targetLRLean = 0.0f;
-			timeBlend = Pow(0.86f, CTimer::GetTimeStep());
-		} else {
-			targetLRLean = clamp(bike->m_fLeanLRAngle / bike->pBikeHandling->fFullAnimLean, -1.0f, 1.0f);
-			timeBlend = Pow(0.86f, CTimer::GetTimeStep());
-		}
-
-		bike->m_fPedLeanAmountLR = bike->m_fPedLeanAmountLR * timeBlend + (1.0 - timeBlend) * targetLRLean;
-
-		if (!IsPlayer()) {
-			targetUDLean = 0.0f;
-
-		} else if (targetUDLean > -1.0f) {
-			targetUDLean = bike->m_fLeanInput;
-			bike->bWheelieCam = false;
-			neededAngForWheelie = 1.0f;
-			if (bike->m_aWheelTimer[0] != 0.0f || bike->m_aWheelTimer[1] != 0.0f || bike->GetForward().z <= 0.0f ||
-				(0.0f == bike->m_aWheelTimer[2] && 0.0f == bike->m_aWheelTimer[3])) {
-
-				if (0.0f == bike->m_aWheelTimer[2] && 0.0f == bike->m_aWheelTimer[3] &&
-					(bike->GetForward().z < 0.0f && (bike->m_aWheelTimer[0] != 0.0f || bike->m_aWheelTimer[1] != 0.0f))) {
-
-					stoppieAng = bike->pBikeHandling->fStoppieAng;
-					if (stoppieAng - bike->GetForward().z > 0.6f * stoppieAng)
-						bike->bWheelieCam = true;
-				}
-			} else {
-				float wheelieAng = bike->pBikeHandling->fWheelieAng;
-				neededAngForWheelie = wheelieAng - bike->GetForward().z;
-				if (neededAngForWheelie < wheelieAng / 2.f)
-					bike->bWheelieCam = true;
-			}
-			if (neededAngForWheelie >= 0.15f) {
-				if (bike->m_fBrakePedal <= 0.5f || velocityFwdDotProd <= 0.01f) {
-					if (bike->m_fGasPedal > 0.5f && targetUDLean <= 0.0f && 0.3f * bike->pHandling->Transmission.fUnkMaxVelocity > velocityFwdDotProd) {
-						targetUDLean = Min(0.1f, targetUDLean);
-					}
-				} else {
-					targetUDLean = Max(0.1f, targetUDLean);
-				}
-			} else {
-				targetUDLean = Max(0.25f, targetUDLean);
-			}
-			float targetLRLeanABS = Abs(targetLRLean);
-			if (targetLRLeanABS > 0.3f) {
-				// Yes, UD
-				targetUDLean *= Max(0.0f, 1.0f - (targetLRLeanABS - 0.3f) * 50.f / 13.f);
-			}
-		}
-		if (IsPlayer()) {
-			float timeBlend = Pow(0.89f, CTimer::GetTimeStep());
-			bike->m_fPedLeanAmountUD = (timeBlend * bike->m_fPedLeanAmountUD) + ((1.0f - timeBlend) * targetUDLean);
-		} else {
-			bike->m_fPedLeanAmountUD = 0.0f;
-		}
-
-		float fwdBackLeanAmount, leftRightLeanAmount;
-		if (Abs(bike->m_fPedLeanAmountLR) <= 0.56f && IsPlayer()) {
-
-			if (Abs(bike->m_fPedLeanAmountUD) <= 0.56f) {
-				CVector2D smoothedLean(bike->m_fPedLeanAmountLR, bike->m_fPedLeanAmountUD);
-				float smoothLeanMag = smoothedLean.Magnitude();
-				if (smoothLeanMag <= 0.01f) {
-					fwdBackLeanAmount = Abs(smoothedLean.y);
-					leftRightLeanAmount = Abs(smoothedLean.x);
-				} else {
-					fwdBackLeanAmount = Abs(smoothedLean.y / smoothLeanMag);
-					leftRightLeanAmount = Abs(smoothedLean.x / smoothLeanMag);
-				}
-			} else {
-				fwdBackLeanAmount = 1.0f;
-				leftRightLeanAmount = 0.0f;
-			}
-		} else {
-			fwdBackLeanAmount = 0.0f;
-			leftRightLeanAmount = 1.0f;
-		}
-		float fwdBackBlend = fwdBackLeanAmount * blendDelta;
-		float leftRightBlend = leftRightLeanAmount * blendDelta;
-		if (IsPlayer()) {
-			if (!fwdAssoc)
-				fwdAssoc = CAnimManager::AddAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_FWD);
-			if (!backAssoc)
-				backAssoc = CAnimManager::AddAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_BACK);
-
-			if (bike->m_fPedLeanAmountUD < 0.0f) {
-				backAssoc->blendAmount = fwdBackBlend;
-				backAssoc->SetCurrentTime(-(bike->m_fPedLeanAmountUD * backAssoc->hierarchy->totalLength));
-				backAssoc->flags &= ~ASSOC_RUNNING;
-				fwdAssoc->blendAmount = 0.0f;
-			} else {
-				fwdAssoc->blendAmount = fwdBackBlend;
-				fwdAssoc->SetCurrentTime(bike->m_fPedLeanAmountUD* fwdAssoc->hierarchy->totalLength);
-				fwdAssoc->flags &= ~ASSOC_RUNNING;
-				backAssoc->blendAmount = 0.0f;
-			}
-		}
-		if (!leftAssoc)
-			leftAssoc = CAnimManager::AddAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_LEFT);
-		if (!rightAssoc)
-			rightAssoc = CAnimManager::AddAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_RIGHT);
-
-		if (bike->m_fPedLeanAmountLR < 0.0f) {
-			leftAssoc->blendAmount = leftRightBlend;
-			leftAssoc->SetCurrentTime(-(bike->m_fPedLeanAmountLR * leftAssoc->hierarchy->totalLength));
-			leftAssoc->flags &= ~ASSOC_RUNNING;
-			rightAssoc->blendAmount = 0.0f;
-		} else {
-			rightAssoc->blendAmount = leftRightBlend;
-			rightAssoc->SetCurrentTime(bike->m_fPedLeanAmountLR* rightAssoc->hierarchy->totalLength);
-			rightAssoc->flags &= ~ASSOC_RUNNING;
-			leftAssoc->blendAmount = 0.0f;
-		}
-		if (velocityFwdDotProd > 0.3f) {
-			RwV3d Xaxis = { 1.0f, 0.0f, 0.0f };
-			RwV3d Yaxis = { 0.0f, 1.0f, 0.0f };
-			RtQuatRotate(&m_pFrames[PED_HEAD]->hanimFrame->q, &Xaxis, CGeneral::GetRandomNumberInRange(-6.0f * velocityFwdDotProd, 6.0f * velocityFwdDotProd), rwCOMBINEPOSTCONCAT);
-			RtQuatRotate(&m_pFrames[PED_HEAD]->hanimFrame->q, &Yaxis, CGeneral::GetRandomNumberInRange(-6.0f * velocityFwdDotProd, 6.0f * velocityFwdDotProd), rwCOMBINEPOSTCONCAT);
-			bDontAcceptIKLookAts = true;
-		}
-		return;
-	}
-
-	if (!IsPlayer())
-		return;
-
-	float steerAngle = m_pMyVehicle->m_fSteerAngle;
-	CAnimBlendAssociation* lDriveAssoc;
-	CAnimBlendAssociation* rDriveAssoc;
-	CAnimBlendAssociation* lbAssoc;
-	CAnimBlendAssociation* sitAssoc;
-	if (m_pMyVehicle->IsBoat() && !(m_pMyVehicle->pHandling->Flags & HANDLING_SIT_IN_BOAT)) {
-		sitAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_BOAT);
-
-		if (!sitAssoc || sitAssoc->blendAmount < 1.0f) {
-			return;
-		}
-
-		lDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_BOAT_L);
-		rDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_BOAT_R);
-		lbAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BOAT_LB);
-	} else if (m_pMyVehicle->bLowVehicle) {
-		sitAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LSIT);
-
-		if (!sitAssoc || sitAssoc->blendAmount < 1.0f) {
-			return;
-		}
-
-		lDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_LOW_L);
-		lbAssoc = nil;
-		rDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_LOW_R);
-	} else {
-		sitAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SIT);
-
-		if (!sitAssoc || sitAssoc->blendAmount < 1.0f) {
-			return;
-		}
-
-		lDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_L);
-		rDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_R);
-		lbAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LB);
-	}
-
-	if (lbAssoc &&
-		TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON
-		&& TheCamera.Cams[TheCamera.ActiveCam].DirectionWasLooking == LOOKING_LEFT) {
-		lbAssoc->blendDelta = -1000.0f;
-	}
-
-	CAnimBlendAssociation* driveByAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_L);
-	if (!driveByAssoc)
-		driveByAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_R);
-	if (!driveByAssoc)
-		driveByAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_LOW_L);
-	if (!driveByAssoc)
-		driveByAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_LOW_R);
-
-	if (m_pMyVehicle->bLowVehicle || m_pMyVehicle->m_fGasPedal >= 0.0f || driveByAssoc ||
-		m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI || m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_PLANE) {
-		if (steerAngle == 0.0f || driveByAssoc) {
-			if (lDriveAssoc)
-				lDriveAssoc->blendAmount = 0.0f;
-			if (rDriveAssoc)
-				rDriveAssoc->blendAmount = 0.0f;
-
-		} else if (steerAngle <= 0.0f) {
-			if (lDriveAssoc)
-				lDriveAssoc->blendAmount = 0.0f;
-
-			if (rDriveAssoc)
-				rDriveAssoc->blendAmount = clamp(steerAngle * -100.0f / 61.0f, 0.0f, 1.0f);
-			else if (m_pMyVehicle->IsBoat() && !(m_pMyVehicle->pHandling->Flags & HANDLING_SIT_IN_BOAT))
-				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT_R);
-			else if (m_pMyVehicle->bLowVehicle)
-				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_LOW_R);
-			else
-				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_R);
-
-		} else {
-			if (rDriveAssoc)
-				rDriveAssoc->blendAmount = 0.0f;
-
-			if (lDriveAssoc)
-				lDriveAssoc->blendAmount = clamp(steerAngle * 100.0f / 61.0f, 0.0f, 1.0f);
-			else if (m_pMyVehicle->IsBoat() && !(m_pMyVehicle->pHandling->Flags & HANDLING_SIT_IN_BOAT))
-				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT_L);
-			else if (m_pMyVehicle->bLowVehicle)
-				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_LOW_L);
-			else
-				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_L);
-		}
-
-		if (lbAssoc)
-			lbAssoc->blendDelta = -4.0f;
-	} else {
-
-		if ((TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_1STPERSON
-			|| TheCamera.Cams[TheCamera.ActiveCam].DirectionWasLooking != LOOKING_LEFT)
-			&& (!lbAssoc || lbAssoc->blendAmount < 1.0f && lbAssoc->blendDelta <= 0.0f)) {
-
-			if (m_pMyVehicle->IsBoat() && !(m_pMyVehicle->pHandling->Flags & HANDLING_SIT_IN_BOAT))
-				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_BOAT_LB, 4.0f);
-			else
-				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_LB, 4.0f);
-		}
-	}
-}
-
-// --MIAMI: Done
-void
 CPed::PositionAttachedPed()
 {
 	if(!m_attachedTo)
@@ -20600,704 +9732,101 @@ 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)->m_bDragsPlayerFromCar) {
-			if (m_nPedState == PED_FALL) {
-				maxArrestDist = 3.5f;
-			} else if (m_nPedState != PED_DRAG_FROM_CAR) {
-				((CCopPed*)this)->m_bDragsPlayerFromCar = 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));
-					
-					CVector2D dirVehGoing = vehOfTarget->m_vecMoveSpeed;
-					if (dirVehGoing.Magnitude() > 0.2f) {
-						CVector2D vehDist = GetPosition() - vehOfTarget->GetPosition();
-						vehDist.Normalise();
-						dirVehGoing.Normalise();
-						if (DotProduct2D(vehDist, dirVehGoing) > 0.8f) {
-							SetAttackTimer(CGeneral::GetRandomNumberInRange(200, 500));
-							SetMoveState(PEDMOVE_STILL);
-						}
-						return ATTACK_IN_PROGRESS;
-					}
-					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)->m_bDragsPlayerFromCar) {
-			if (m_nPedState == PED_FALL) {
-				maxArrestDist = 3.5f;
-			} else if (m_nPedState != PED_DRAG_FROM_CAR) {
-				((CCopPed*)this)->m_bDragsPlayerFromCar = 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(600.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(1000, 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;
-}
-
-// --MIAMI: Done
 void
-CPed::ScanForDelayedResponseThreats(void)
+CPed::Undress(const char* name)
 {
-	if (m_threatFlags)
-		return;
+	int mi = GetModelIndex();
+	CAnimBlendAssociation* pAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_OUT);
+	if (pAnim)
+		FinishTalkingOnMobileCB(pAnim, this);
 
-	m_threatEntity = nil;
-	m_pEventEntity = nil;
-	m_threatFlags = ScanForThreats();
-	if (m_threatFlags) {
-		if (m_threatEntity || m_pEventEntity) {
-			m_threatCheckTimer = CTimer::GetTimeInMilliseconds() + m_threatCheckInterval;
-			return;
-		}
-		m_threatFlags = 0;
-	}
-	m_threatCheckTimer = 0;
+	DeleteRwObject();
+	if (IsPlayer())
+		mi = MI_PLAYER;
+	CStreaming::RequestSpecialModel(mi, name, STREAMFLAGS_DEPENDENCY | STREAMFLAGS_SCRIPTOWNED);
+	CWorld::Remove(this);
 }
 
 // --MIAMI: Done
 void
-CPed::DeleteSunbatheIdleAnimCB(CAnimBlendAssociation *assoc, void *arg)
+CPed::Dress(void)
 {
-	CPed *ped = (CPed*) arg;
-
-	if (CTimer::GetTimeInMilliseconds() <= ped->m_nWaitTimer
-		&& !ped->bGotUpOfMyOwnAccord && !ped->bFleeWhenStanding && !ped->m_threatEx) {
-		ped->m_pNextPathNode = nil;
-		ped->bFleeWhenStanding = true;
-		ped->m_threatEx = FindPlayerPed();
-		ped->SetGetUp();
-		ped->ClearWaitState();
-	}
-	ped->m_nWaitTimer = 0;
-	ped->RestoreHeadingRate();
-	ped->Wait();
+	int mi = GetModelIndex();
+	m_modelIndex = -1;
+	SetModelIndex(mi);
+	m_nPedState = PED_IDLE;
+	m_nLastPedState = PED_NONE;
+	m_objective = OBJECTIVE_NONE;
+	m_prevObjective = OBJECTIVE_NONE;
+	m_nWaitState = WAITSTATE_FALSE;
+	CWorld::Add(this);
+	RestoreHeadingRate();
 }
 
-// --MIAMI: Done
 void
-CPed::PedSetPreviousStateCB(CAnimBlendAssociation* assoc, void* arg)
+CPed::Say(uint16 audio, int32 time)
 {
-	CPed* ped = (CPed*)arg;
-	ped->RestorePreviousState();
-	ped->m_pVehicleAnim = nil;
+	if (m_delayedSoundID == -1) {
+		m_delayedSoundID = audio;
+		m_delayedSoundTimer = CTimer::GetTimeInMilliseconds() + time;
+	}
 }
 
-// --MIAMI: Done
+#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));
 void
-CPed::PedAnimShuffleCB(CAnimBlendAssociation* assoc, void* arg)
+CPed::Save(uint8*& buf)
 {
-	CPed *ped = (CPed*)arg;
-	if (ped->EnteringCar()) {
-		PedSetInCarCB(nil, ped);
-	} else if (ped->m_nPedState != PED_DRIVING) {
-		ped->QuitEnteringCar();
-	}
+	SkipSaveBuf(buf, 52);
+	CopyToBuf(buf, GetPosition().x);
+	CopyToBuf(buf, GetPosition().y);
+	CopyToBuf(buf, GetPosition().z);
+	SkipSaveBuf(buf, 288);
+	CopyToBuf(buf, CharCreatedBy);
+	SkipSaveBuf(buf, 499);
+	CopyToBuf(buf, m_fHealth);
+	CopyToBuf(buf, m_fArmour);
+	SkipSaveBuf(buf, 172);
+	for (int i = 0; i < 10; i++) // has to be hardcoded
+		m_weapons[i].Save(buf);
+	SkipSaveBuf(buf, 252);
 }
 
-// --MIAMI: Done
 void
-PlayRandomAnimationsFromAnimBlock(CPed* ped, AssocGroupId animGroup, uint32 first, uint32 amount)
+CPed::Load(uint8*& buf)
 {
-	if (!ped->IsPedInControl())
-		return;
-
-	const char *groupName = CAnimManager::GetAnimGroupName(animGroup);
-	CAnimBlock *animBlock = CAnimManager::GetAnimationBlock(groupName);
-	CAnimBlendAssociation *assoc;
-	for (assoc = RpAnimBlendClumpGetFirstAssociation(ped->GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
-		int first = animBlock->firstIndex;
-		int index = assoc->hierarchy - CAnimManager::GetAnimation(0);
-		if (index >= first && index < first + animBlock->numAnims) {
-			break;
-		}
-	}
-
-	if (CTimer::GetTimeInMilliseconds() > ped->m_nWaitTimer && assoc)
-		assoc->flags &= ~ASSOC_REPEAT;
+	SkipSaveBuf(buf, 52);
+	CopyFromBuf(buf, GetMatrix().GetPosition().x);
+	CopyFromBuf(buf, GetMatrix().GetPosition().y);
+	CopyFromBuf(buf, GetMatrix().GetPosition().z);
+	SkipSaveBuf(buf, 288);
+	CopyFromBuf(buf, CharCreatedBy);
+	SkipSaveBuf(buf, 499);
+	CopyFromBuf(buf, m_fHealth);
+	CopyFromBuf(buf, m_fArmour);
+	SkipSaveBuf(buf, 172);
+	m_currentWeapon = WEAPONTYPE_UNARMED;
 
-	if (!assoc || assoc->blendDelta < 0.0f) {
-		int selectedAnimOffset;
-		do
-			selectedAnimOffset = CGeneral::GetRandomNumberInRange(0, amount);
-		while (assoc && first + selectedAnimOffset == assoc->animId);
+	CWeapon bufWeapon;
+	for (int i = 0; i < 10; i++) { // has to be hardcoded
+		bufWeapon.Load(buf);
 
-		assoc = CAnimManager::BlendAnimation(ped->GetClump(), animGroup, (AnimationId)(first + selectedAnimOffset), 3.0f);
+		if (bufWeapon.m_eWeaponType != WEAPONTYPE_UNARMED) {
+			int modelId = CWeaponInfo::GetWeaponInfo(bufWeapon.m_eWeaponType)->m_nModelId;
+			if (modelId != -1) {
+				CStreaming::RequestModel(modelId, STREAMFLAGS_DEPENDENCY);
+				int modelId2 = CWeaponInfo::GetWeaponInfo(bufWeapon.m_eWeaponType)->m_nModel2Id;
+				if (modelId2 != -1)
+					CStreaming::RequestModel(modelId2, STREAMFLAGS_DEPENDENCY);
 
-		assoc->SetFinishCallback(CPed::FinishedWaitCB, ped);
-		if (assoc->flags & ASSOC_REPEAT)
-			ped->m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(3000, 8000);
-		else
-			ped->m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 8000;
+				CStreaming::LoadAllRequestedModels(false);
+			}
+			GiveWeapon(bufWeapon.m_eWeaponType, bufWeapon.m_nAmmoTotal, false);
+		}
 	}
+	SkipSaveBuf(buf, 252);
 }
-
-// --MIAMI: Done
-bool
-IsPedPointerValid_NotInWorld(CPed* pPed)
-{
-	if (!pPed)
-		return false;
-	int index = CPools::GetPedPool()->GetJustIndex(pPed);
-#ifdef FIX_BUGS
-	if (index < 0 || index >= NUMPEDS)
-#else
-	if (index < 0 || index > NUMPEDS)
+#undef CopyFromBuf
+#undef CopyToBuf
 #endif
-		return false;
-	return true;
-}
-
-// --MIAMI: Done
-bool
-IsPedPointerValid(CPed* pPed)
-{
-	if (!IsPedPointerValid_NotInWorld(pPed))
-		return false;
-	if (pPed->bInVehicle && pPed->m_pMyVehicle)
-		return IsEntityPointerValid(pPed->m_pMyVehicle);
-	return pPed->m_entryInfoList.first || pPed == FindPlayerPed();
-}
-
-// --MIAMI: Done
-void
-CPed::SetLook(CEntity* to)
-{
-	if (IsPedInControl()) {
-		SetStoredState();
-		SetPedState(PED_LOOK_ENTITY);
-		SetLookFlag(to, false);
-	}
-}
-
-// --MIAMI: Done
-// Unused
-void
-CPed::SetLook(float direction)
-{
-	if (IsPedInControl()) {
-		SetStoredState();
-		SetPedState(PED_LOOK_HEADING);
-		SetLookFlag(direction, false);
-	}
-}
-
-// --MIAMI: Done
-// Unused
-void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg)
-{
-	CPed* pPed = (CPed*)arg;
-	CMatrix mat(pPed->GetMatrix());
-	CVehicle* pVehicle = pPed->m_pMyVehicle;
-	const CVector& offset = (pVehicle->bIsVan && (pPed->m_vehEnterType == CAR_DOOR_RR || pPed->m_vehEnterType == CAR_DOOR_LR)) ? vecPedVanRearDoorAnimOffset : vecPedCarDoorAnimOffset;
-	CVector position = Multiply3x3(mat, offset) + pPed->GetPosition();
-	CPedPlacement::FindZCoorForPed(&position);
-	pPed->SetMoveSpeed(0.0f, 0.0f, 0.0f);
-	pPed->SetPosition(position);
-}