Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

CPed cleanup

Browse Source
This commit is contained in:
aap 2019-06-26 11:19:56 +02:00
parent 5350574b6d
commit 8510792256
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/entities/Ped.cpp
View File

@ -1076,7 +1076,6 @@ CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg)
ped->m_pSeekTarget = nil; ped->m_pSeekTarget = nil;
vehicle = ped->m_pMyVehicle; vehicle = ped->m_pMyVehicle;
if (ped->m_vehEnterType <= VEHICLE_ENTER_REAR_LEFT) {
switch (ped->m_vehEnterType) { switch (ped->m_vehEnterType) {
case VEHICLE_ENTER_FRONT_RIGHT: case VEHICLE_ENTER_FRONT_RIGHT:
vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_FR; vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_FR;
@ -1090,9 +1089,6 @@ CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg)
case VEHICLE_ENTER_REAR_LEFT: case VEHICLE_ENTER_REAR_LEFT:
vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_RL; vehicle->m_nGettingOutFlags &= ~GETTING_IN_OUT_RL;
break; break;
default:
break;
}
} }
if (vehicle->pDriver == ped) { if (vehicle->pDriver == ped) {
@ -1431,7 +1427,7 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
m_fRotationCur = m_fRotationDest; m_fRotationCur = m_fRotationDest;
} else { } else {
float limitedAngle = CGeneral::LimitRadianAngle(m_fRotationDest); 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; m_vecOffsetSeek.z = 0.0;
if (timeUntilStateChange <= 0.0f) { if (timeUntilStateChange <= 0.0f) {