1 files changed, 257 insertions, 6 deletions

diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp
index 85682ae3..fcdd60da 100644
--- a/src/core/PlayerInfo.cpp
+++ b/src/core/PlayerInfo.cpp
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "patcher.h"
+#include "main.h"
 #include "PlayerPed.h"
 #include "PlayerInfo.h"
 #include "Frontend.h"
@@ -15,13 +16,17 @@
 #include "ProjectileInfo.h"
 #include "Explosion.h"
 #include "Script.h"
-#include "Vehicle.h"
+#include "Automobile.h"
 #include "HandlingMgr.h"
 #include "General.h"
-#include "main.h"
 #include "SpecialFX.h"
-
-WRAPPER void CPlayerInfo::Process(void) { EAXJMP(0x49FD30); }
+#include "Cranes.h"
+#include "Bridge.h"
+#include "WaterLevel.h"
+#include "PathFind.h"
+#include "ZoneCull.h"
+#include "Renderer.h"
+#include "Streaming.h"
 
 void
 CPlayerInfo::SetPlayerSkin(char *skin)
@@ -113,8 +118,8 @@ CPlayerInfo::Clear(void)
 	m_nTrafficMultiplier = 0;

 	m_fRoadDensity = 1.0f;

 	m_bInRemoteMode = false;

-	m_bSwitchTaxi = false;

-	m_nSwitchTaxiTime = 0;

+	m_bUnusedTaxiThing = false;

+	m_nUnusedTaxiTimer = 0;

 	m_nCollectedPackages = 0;

 	m_nTotalPackages = 3;

 	m_nTimeLastHealthLoss = 0;

@@ -306,6 +311,251 @@ INITSAVEBUF
 // VALIDATESAVEBUF(size)

 }
 
+void

+CPlayerInfo::FindClosestCarSectorList(CPtrList& carList, CPed* ped, float unk1, float unk2, float unk3, float unk4, float* lastClosestness, CVehicle** closestCarOutput)

+{

+	for (CPtrNode* node = carList.first; node; node = node->next) {

+		CVehicle *car = (CVehicle*)node->item;

+		if(car->m_scanCode != CWorld::GetCurrentScanCode()) {

+			if (!car->bUsesCollision || !car->IsVehicle())

+				continue;

+

+			car->m_scanCode = CWorld::GetCurrentScanCode();

+			if (car->m_status != STATUS_WRECKED && car->m_status != STATUS_TRAIN_MOVING

+				&& (car->GetUp().z > 0.3f || (car->IsVehicle() && ((CVehicle*)car)->m_vehType == VEHICLE_TYPE_BIKE))) {

+				CVector carCentre = car->GetBoundCentre();

+

+				if (Abs(ped->GetPosition().z - carCentre.z) < 2.0f) {

+					float dist = (ped->GetPosition() - carCentre).Magnitude2D();

+					if (dist <= 10.0f && !CCranes::IsThisCarBeingCarriedByAnyCrane(car)) {

+						EvaluateCarPosition(car, ped, dist, lastClosestness, closestCarOutput);

+					}

+				}

+			}

+		}

+	}

+}
+
+void

+CPlayerInfo::Process(void)

+{

+	// Unused taxi feature. Gives you a dollar for every second with a passenger. Can be toggled via 0x29A opcode.

+	bool startTaxiTimer = true;

+	if (m_bUnusedTaxiThing && m_pPed->bInVehicle) {

+		CVehicle *veh = m_pPed->m_pMyVehicle;

+		if ((veh->m_modelIndex == MI_TAXI || veh->m_modelIndex == MI_CABBIE || veh->m_modelIndex == MI_BORGNINE)

+			&& veh->pDriver == m_pPed && veh->m_nNumPassengers != 0) {

+			for (uint32 timePassed = CTimer::GetTimeInMilliseconds() - m_nUnusedTaxiTimer; timePassed >= 1000; m_nUnusedTaxiTimer += 1000) {

+				timePassed -= 1000;

+				++m_nMoney;

+			}

+			startTaxiTimer = false;

+		}

+	}

+	if (startTaxiTimer)

+		m_nUnusedTaxiTimer = CTimer::GetTimeInMilliseconds();

+

+	// The effect that makes money counter does while earning/losing money

+	if (m_nVisibleMoney != m_nMoney) {

+		int diff = m_nMoney - m_nVisibleMoney;

+		int diffAbs = Abs(diff);

+		int changeBy;

+

+		if (diffAbs > 100000)

+			changeBy = 12345;

+		else if (diffAbs > 10000)

+			changeBy = 1234;

+		else if (diffAbs > 1000)

+			changeBy = 123;

+		else if (diffAbs > 50)

+			changeBy = 42;

+		else

+			changeBy = 1;

+

+		if (diff < 0)

+			m_nVisibleMoney -= changeBy;

+		else

+			m_nVisibleMoney += changeBy;

+	}

+

+	if (!(CTimer::GetFrameCounter() & 15)) {

+		CVector2D playerPos = m_pPed->bInVehicle ? m_pPed->m_pMyVehicle->GetPosition() : m_pPed->GetPosition();

+		m_fRoadDensity = ThePaths.CalcRoadDensity(playerPos.x, playerPos.y);

+	}

+

+	m_fRoadDensity = clamp(m_fRoadDensity, 0.4f, 1.45f);

+

+	// Because vehicle enter/exit use same key binding.

+	bool enterOrExitVeh;

+	if (m_pPed->m_ped_flagI4 && m_pPed->bInVehicle)

+		enterOrExitVeh = CPad::GetPad(0)->ExitVehicleJustDown();

+	else

+		enterOrExitVeh = CPad::GetPad(0)->GetExitVehicle();

+

+	if (enterOrExitVeh && m_pPed->m_nPedState != PED_SNIPER_MODE && m_pPed->m_nPedState != PED_ROCKET_ODE) {

+		if (m_pPed->bInVehicle) {

+			if (!m_pRemoteVehicle) {

+				CEntity *surfaceBelowVeh = m_pPed->m_pMyVehicle->m_pCurGroundEntity;

+				if (!surfaceBelowVeh || !CBridge::ThisIsABridgeObjectMovingUp(surfaceBelowVeh->m_modelIndex)) {

+					CVehicle *veh = m_pPed->m_pMyVehicle;

+					if (!veh->IsBoat() || veh->m_nDoorLock == CARLOCK_LOCKED_PLAYER_INSIDE) {

+

+						// This condition will always return true, else block was probably WIP Miami code.

+						if (veh->m_vehType != VEHICLE_TYPE_BIKE || veh->m_nDoorLock == CARLOCK_LOCKED_PLAYER_INSIDE) {

+							if (veh->m_status != STATUS_WRECKED && veh->m_status != STATUS_TRAIN_MOVING && veh->m_nDoorLock != CARLOCK_LOCKED_PLAYER_INSIDE) {

+								if (veh->m_vecMoveSpeed.Magnitude() < 0.17f && CTimer::GetTimeScale() >= 0.5f && !veh->bIsInWater) {

+									m_pPed->SetObjective(OBJECTIVE_LEAVE_VEHICLE, veh);

+								}

+							}

+						} else {

+							CVector sth = 0.7f * veh->GetRight() + veh->GetPosition();

+							bool found = false;

+							float groundZ = CWorld::FindGroundZFor3DCoord(sth.x, sth.y, 2.0f + sth.z, &found);

+

+							if (found)

+								sth.z = 1.0f + groundZ;

+							m_pPed->m_nPedState = PED_IDLE;

+							m_pPed->SetMoveState(PEDMOVE_STILL);

+							CPed::PedSetOutCarCB(0, m_pPed);

+							CAnimManager::BlendAnimation(m_pPed->GetClump(), m_pPed->m_animGroup, ANIM_IDLE_STANCE, 100.0f);

+							CAnimManager::BlendAnimation(m_pPed->GetClump(), ASSOCGRP_STD, ANIM_FALL_LAND, 100.0f);

+							m_pPed->GetPosition() = sth;

+							m_pPed->SetMoveState(PEDMOVE_STILL);

+							m_pPed->m_vecMoveSpeed = veh->m_vecMoveSpeed;

+						}

+					} else {

+						// The code in here was under CPed::SetExitBoat in VC, did the same for here.

+						m_pPed->SetExitBoat(veh);

+						m_pPed->bTryingToReachDryLand = true;

+					}

+				}

+			}

+		} else {

+			// Enter vehicle

+			if (CPad::GetPad(0)->ExitVehicleJustDown()) {

+				bool weAreOnBoat = false;

+				float lastClosestness = 0.0f;

+				CVehicle *carBelow;

+				CEntity *surfaceBelow = m_pPed->m_pCurrentPhysSurface;

+				if (surfaceBelow && surfaceBelow->IsVehicle()) {

+					carBelow = (CVehicle*)surfaceBelow;

+					if (carBelow->IsBoat()) {

+						weAreOnBoat = true;

+						m_pPed->bOnBoat = true;

+#ifdef VC_PED_PORTS

+						if (carBelow->m_status != STATUS_WRECKED && carBelow->GetUp().z > 0.3f)

+#else

+						if (carBelow->m_status != STATUS_WRECKED)

+#endif

+							m_pPed->SetSeekBoatPosition(carBelow);

+					}

+				}

+				// Find closest car

+				if (!weAreOnBoat) {

+					float minX = m_pPed->GetPosition().x - 10.0f;

+					float maxX = 10.0f + m_pPed->GetPosition().x;

+					float minY = m_pPed->GetPosition().y - 10.0f;

+					float maxY = 10.0f + m_pPed->GetPosition().y;

+

+					int minXSector = CWorld::GetSectorIndexX(minX);

+					if (minXSector < 0) minXSector = 0;

+					int minYSector = CWorld::GetSectorIndexY(minY);

+					if (minYSector < 0) minYSector = 0;

+					int maxXSector = CWorld::GetSectorIndexX(maxX);

+					if (maxXSector > NUMSECTORS_X - 1) maxXSector = NUMSECTORS_X - 1;

+					int maxYSector = CWorld::GetSectorIndexY(maxY);

+					if (maxYSector > NUMSECTORS_Y - 1) maxYSector = NUMSECTORS_Y - 1;

+

+					CWorld::AdvanceCurrentScanCode();

+

+					for (int curY = minYSector; curY <= maxYSector; curY++) {

+						for (int curX = minXSector; curX <= maxXSector; curX++) {

+							CSector *sector = CWorld::GetSector(curX, curY);

+							FindClosestCarSectorList(sector->m_lists[ENTITYLIST_VEHICLES], m_pPed,

+								minX, minY, maxX, maxY, &lastClosestness, &carBelow);

+							FindClosestCarSectorList(sector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], m_pPed,

+								minX, minY, maxX, maxY, &lastClosestness, &carBelow);

+						}

+					}

+				}

+				// carBelow is now closest vehicle

+				if (carBelow && !weAreOnBoat) {

+					if (carBelow->m_status == STATUS_TRAIN_NOT_MOVING) {

+						m_pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, carBelow);

+					} else if (carBelow->IsBoat()) {

+						if (!carBelow->pDriver) {

+							m_pPed->m_vehEnterType = 0;

+							m_pPed->SetEnterCar(carBelow, m_pPed->m_vehEnterType);

+						}

+					} else {

+						m_pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, carBelow);

+					}

+				}

+			}

+		}

+	}

+	if (m_bInRemoteMode) {

+		uint32 timeWithoutRemoteCar = CTimer::GetTimeInMilliseconds() - m_nTimeLostRemoteCar;

+		if (CTimer::GetPreviousTimeInMilliseconds() - m_nTimeLostRemoteCar < 1000 && timeWithoutRemoteCar >= 1000 && m_WBState == WBSTATE_PLAYING) {

+			TheCamera.SetFadeColour(0, 0, 0);

+			TheCamera.Fade(1.0f, 0);

+		}

+		if (timeWithoutRemoteCar > 2000) {

+			if (m_WBState == WBSTATE_PLAYING) {

+				TheCamera.RestoreWithJumpCut();

+				TheCamera.SetFadeColour(0, 0, 0);

+				TheCamera.Fade(1.0f, 1);

+				TheCamera.Process();

+				CTimer::Stop();

+				CCullZones::ForceCullZoneCoors(TheCamera.GetPosition());

+				CRenderer::RequestObjectsInFrustum();

+				CStreaming::LoadAllRequestedModels(false);

+				CTimer::Update();

+			}

+			m_bInRemoteMode = false;

+			CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil;

+			if (FindPlayerVehicle()) {

+				FindPlayerVehicle()->m_status = STATUS_PLAYER;

+			}

+		}

+	}

+	if (!(CTimer::GetFrameCounter() & 31)) {

+		CVehicle *veh = FindPlayerVehicle();

+		if (veh && m_pPed->bInVehicle && veh->GetUp().z < 0.0f

+			&& veh->m_vecMoveSpeed.Magnitude() < 0.05f && veh->IsCar() && !veh->bIsInWater) {

+

+			if (veh->GetUp().z < -0.5f) {

+				m_nUpsideDownCounter += 2;

+			

+			} else {

+				m_nUpsideDownCounter++;

+			}

+		} else {

+			m_nUpsideDownCounter = 0;

+		}

+

+		if (m_nUpsideDownCounter > 6 && veh->bCanBeDamaged) {

+			veh->m_fHealth = 249.0f < veh->m_fHealth ? 249.0f : veh->m_fHealth;

+			if (veh->IsCar()) {

+				CAutomobile* car = (CAutomobile*)veh;

+				car->Damage.SetEngineStatus(225);

+				car->m_pSetOnFireEntity = nil;

+			}

+		}

+	}

+	if (FindPlayerVehicle()) {

+		CVehicle *veh = FindPlayerVehicle();

+		veh->m_nZoneLevel = -1;

+		for (int i = 0; i < ARRAY_SIZE(veh->pPassengers); i++) {

+			if (veh->pPassengers[i])

+				veh->pPassengers[i]->m_nZoneLevel = 0;

+		}

+		CStats::DistanceTravelledInVehicle += veh->m_fDistanceTravelled;

+	} else {

+		CStats::DistanceTravelledOnFoot += FindPlayerPed()->m_fDistanceTravelled;

+	}

+}
+
 STARTPATCHES
 	InjectHook(0x4B5DC0, &CPlayerInfo::dtor, PATCH_JUMP);
 	InjectHook(0x4A1700, &CPlayerInfo::LoadPlayerSkin, PATCH_JUMP);
@@ -320,4 +570,5 @@ STARTPATCHES
 	InjectHook(0x4A15F0, &CPlayerInfo::AwardMoneyForExplosion, PATCH_JUMP);
 	InjectHook(0x4A0B20, &CPlayerInfo::LoadPlayerInfo, PATCH_JUMP);
 	InjectHook(0x4A0960, &CPlayerInfo::SavePlayerInfo, PATCH_JUMP);
+	InjectHook(0x49FD30, &CPlayerInfo::Process, PATCH_JUMP);
 ENDPATCHES