diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2019-06-26 16:27:52 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2019-06-26 16:27:52 +0200 |
| commit | d30875d725ad5bb7f0d1321ca5e6d31f8b2760e1 (patch) | |
| tree | eacee2b0cf219fc301b64db22c96fb7eea3b8709 /src/entities/Ped.cpp | |
| parent | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff) | |
| parent | fixed bug in CPed (diff) | |
| download | re3-d30875d725ad5bb7f0d1321ca5e6d31f8b2760e1.tar re3-d30875d725ad5bb7f0d1321ca5e6d31f8b2760e1.tar.gz re3-d30875d725ad5bb7f0d1321ca5e6d31f8b2760e1.tar.bz2 re3-d30875d725ad5bb7f0d1321ca5e6d31f8b2760e1.tar.lz re3-d30875d725ad5bb7f0d1321ca5e6d31f8b2760e1.tar.xz re3-d30875d725ad5bb7f0d1321ca5e6d31f8b2760e1.tar.zst re3-d30875d725ad5bb7f0d1321ca5e6d31f8b2760e1.zip | |
Diffstat (limited to 'src/entities/Ped.cpp')
| -rw-r--r-- | src/entities/Ped.cpp | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/src/entities/Ped.cpp b/src/entities/Ped.cpp index 7a48cdc4..a80fc770 100644 --- a/src/entities/Ped.cpp +++ b/src/entities/Ped.cpp @@ -509,11 +509,11 @@ CPed::OurPedCanSeeThisOne(CEntity *target) // Check if target is behind ped if (DotProduct2D(dist, CVector2D(this->GetForward())) < 0.0f) - return 0; + return false; // Check if target is too far away - if (dist.Magnitude() < 40.0f) - return 0; + if (dist.Magnitude() >= 40.0f) + return false; // Check line of sight from head CVector headPos = this->GetPosition(); @@ -1076,23 +1076,19 @@ CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg) ped->m_pSeekTarget = nil; vehicle = ped->m_pMyVehicle; - if (ped->m_vehEnterType <= VEHICLE_ENTER_REAR_LEFT) { - switch (ped->m_vehEnterType) { - case VEHICLE_ENTER_FRONT_RIGHT: - vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_FR; - break; - case VEHICLE_ENTER_REAR_RIGHT: - vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_RR; - break; - case VEHICLE_ENTER_FRONT_LEFT: - vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_FL; - break; - case VEHICLE_ENTER_REAR_LEFT: - vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_RL; - break; - default: - break; - } + switch (ped->m_vehEnterType) { + case VEHICLE_ENTER_FRONT_RIGHT: + vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_FR; + break; + case VEHICLE_ENTER_REAR_RIGHT: + vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_RR; + break; + case VEHICLE_ENTER_FRONT_LEFT: + vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_FL; + break; + case VEHICLE_ENTER_REAR_LEFT: + vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_RL; + break; } if (vehicle->pDriver == ped) { @@ -1431,7 +1427,7 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase) m_fRotationCur = m_fRotationDest; } else { float limitedAngle = CGeneral::LimitRadianAngle(m_fRotationDest); - float timeUntilStateChange = (m_nPedStateTimer - CTimer::GetTimeInMilliseconds()) * 0.0016666667f; // changing this to 0.002 causes wrong rotation + float timeUntilStateChange = (m_nPedStateTimer - CTimer::GetTimeInMilliseconds())/600.0f; m_vecOffsetSeek.z = 0.0; if (timeUntilStateChange <= 0.0f) { |