diff options
| author | aap <aap@papnet.eu> | 2021-01-22 10:33:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 10:33:55 +0100 |
| commit | 4acc9b08a2179ebf2a12e52759f7b4193c047533 (patch) | |
| tree | 5adc99bd4296a54cc49354b291876603a72eed6e /src/peds | |
| parent | fuck (diff) | |
| parent | m_nWantedLevel -> GetWantedLevel() (diff) | |
| download | re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar.gz re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar.bz2 re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar.lz re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar.xz re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.tar.zst re3-4acc9b08a2179ebf2a12e52759f7b4193c047533.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/peds/CopPed.cpp | 6 | ||||
| -rw-r--r-- | src/peds/PedAI.cpp | 2 | ||||
| -rw-r--r-- | src/peds/PlayerPed.cpp | 2 | ||||
| -rw-r--r-- | src/peds/Population.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp index 762c7f1a..3b777394 100644 --- a/src/peds/CopPed.cpp +++ b/src/peds/CopPed.cpp @@ -196,7 +196,7 @@ CCopPed::ClearPursuit(void) m_bZoneDisabled = false; ClearObjective(); if (IsPedInControl()) { - if (!m_pMyVehicle || wanted->m_nWantedLevel != 0) { + if (!m_pMyVehicle || wanted->GetWantedLevel() != 0) { if (m_pMyVehicle && (m_pMyVehicle->GetPosition() - GetPosition()).MagnitudeSqr() < sq(5.0f)) { m_nLastPedState = PED_IDLE; SetSeek((CEntity*)m_pMyVehicle, 2.5f); @@ -295,7 +295,7 @@ CCopPed::ScanForCrimes(void) if (!m_bIsInPursuit) { CPlayerPed *player = FindPlayerPed(); if ((m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER) - && player->m_pWanted->m_nWantedLevel == 0) { + && player->m_pWanted->GetWantedLevel() == 0) { if (player->m_pMyVehicle #ifdef FIX_BUGS @@ -311,7 +311,7 @@ void CCopPed::CopAI(void) { CWanted *wanted = FindPlayerPed()->m_pWanted; - int wantedLevel = wanted->m_nWantedLevel; + int wantedLevel = wanted->GetWantedLevel(); CPhysical *playerOrHisVeh = FindPlayerVehicle() ? (CPhysical*)FindPlayerVehicle() : (CPhysical*)FindPlayerPed(); if (wanted->m_bIgnoredByEveryone || wanted->m_bIgnoredByCops) { diff --git a/src/peds/PedAI.cpp b/src/peds/PedAI.cpp index 68983dac..04e6f596 100644 --- a/src/peds/PedAI.cpp +++ b/src/peds/PedAI.cpp @@ -924,7 +924,7 @@ CPed::ProcessObjective(void) 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.fMaxCruiseVelocity); + m_pMyVehicle->AutoPilot.m_nCruiseSpeed = (FindPlayerPed()->m_pWanted->GetWantedLevel() * 0.1f + 0.6f) * (GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fMaxCruiseVelocity); m_pMyVehicle->AutoPilot.m_nCarMission = CCarAI::FindPoliceCarMissionForWantedLevel(); } else { m_pMyVehicle->AutoPilot.m_nCruiseSpeed = GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fMaxCruiseVelocity * 0.8f; diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index f07d1ac7..b66c1854 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -1654,7 +1654,7 @@ CPlayerPed::ProcessControl(void) if (m_nEvadeAmount == 0) m_pEvadingFrom = nil; - if (m_pWanted->m_nWantedLevel > 0) + if (m_pWanted->GetWantedLevel() > 0) FindNewAttackPoints(); UpdateMeleeAttackers(); diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp index f886597f..b1943358 100644 --- a/src/peds/Population.cpp +++ b/src/peds/Population.cpp @@ -537,7 +537,7 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree CTheZones::GetZoneInfoForTimeOfDay(&playerCentreOfWorld, &zoneInfo); CWanted *wantedInfo = playerInfo->m_pPed->m_pWanted; - if (wantedInfo->m_nWantedLevel > 2) { + if (wantedInfo->GetWantedLevel() > 2) { if (!CGame::IsInInterior() && (CGeneral::GetRandomNumber() % 32 == 0) && FindPlayerVehicle()) forceAddingCop = true; |