diff options
| author | aap <aap@papnet.eu> | 2019-06-26 11:19:56 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2019-06-26 11:19:56 +0200 |
| commit | 8510792256948f85241d7b18bc3a37b5f1766dcf (patch) | |
| tree | b0aab8efc22afbbc756dce3a2f25cd02b5256099 /src/entities | |
| parent | Merge pull request #50 from erorcun/erorcun (diff) | |
| download | re3-8510792256948f85241d7b18bc3a37b5f1766dcf.tar re3-8510792256948f85241d7b18bc3a37b5f1766dcf.tar.gz re3-8510792256948f85241d7b18bc3a37b5f1766dcf.tar.bz2 re3-8510792256948f85241d7b18bc3a37b5f1766dcf.tar.lz re3-8510792256948f85241d7b18bc3a37b5f1766dcf.tar.xz re3-8510792256948f85241d7b18bc3a37b5f1766dcf.tar.zst re3-8510792256948f85241d7b18bc3a37b5f1766dcf.zip | |
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Ped.cpp | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/entities/Ped.cpp b/src/entities/Ped.cpp index 7a48cdc4..10de9fa8 100644 --- a/src/entities/Ped.cpp +++ b/src/entities/Ped.cpp @@ -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) { |