diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-04 22:48:25 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-04 22:48:25 +0100 |
| commit | 6fa081e0042bab470ac91e98a7d14d04decf6028 (patch) | |
| tree | 202a9bc7cefaf26ec083e85d808fe57d555e92dc | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-6fa081e0042bab470ac91e98a7d14d04decf6028.tar re3-6fa081e0042bab470ac91e98a7d14d04decf6028.tar.gz re3-6fa081e0042bab470ac91e98a7d14d04decf6028.tar.bz2 re3-6fa081e0042bab470ac91e98a7d14d04decf6028.tar.lz re3-6fa081e0042bab470ac91e98a7d14d04decf6028.tar.xz re3-6fa081e0042bab470ac91e98a7d14d04decf6028.tar.zst re3-6fa081e0042bab470ac91e98a7d14d04decf6028.zip | |
| -rw-r--r-- | src/control/Script2.cpp | 3 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/control/Script2.cpp b/src/control/Script2.cpp index 93098dac..8f56745c 100644 --- a/src/control/Script2.cpp +++ b/src/control/Script2.cpp @@ -1142,6 +1142,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command) pPed->SetPosition(pVehicle->GetPosition()); pPed->SetOrientation(0.0f, 0.0f, 0.0f); CPopulation::ms_nTotalMissionPeds++; + CWorld::Add(pPed); if (ScriptParams[3] >= 0) pVehicle->AddPassenger(pPed, ScriptParams[3]); else @@ -1149,12 +1150,10 @@ int8 CRunningScript::ProcessCommands400To499(int32 command) pPed->m_pMyVehicle = pVehicle; pPed->m_pMyVehicle->RegisterReference((CEntity**)&pPed->m_pMyVehicle); pPed->bInVehicle = true; - pVehicle->SetStatus(STATUS_PHYSICS); pPed->SetPedState(PED_DRIVING); pPed->bUsesCollision = false; pPed->AddInCarAnims(pVehicle, false); pPed->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pPed->GetPosition()); - CWorld::Add(pPed); ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPed); StoreParameters(&m_nIp, 1); if (m_bIsMissionScript) diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index a1154e81..06a545ef 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -1876,7 +1876,7 @@ CVehicle::AddPassenger(CPed *passenger) int i; if(IsBike()) - ApplyTurnForce(-0.2f*passenger->m_fMass * GetUp(), -0.1f*GetForward()); + ApplyTurnForce(-0.02f*passenger->m_fMass * GetUp(), -0.1f*GetForward()); else ApplyTurnForce(0.0f, 0.0f, -0.2f*passenger->m_fMass, passenger->GetPosition().x - GetPosition().x, @@ -1899,7 +1899,7 @@ CVehicle::AddPassenger(CPed *passenger, uint8 n) return AddPassenger(passenger); if(IsBike()) - ApplyTurnForce(-0.2f*passenger->m_fMass * GetUp(), -0.1f*GetForward()); + ApplyTurnForce(-0.02f*passenger->m_fMass * GetUp(), -0.1f*GetForward()); else ApplyTurnForce(0.0f, 0.0f, -0.2f*passenger->m_fMass, passenger->GetPosition().x - GetPosition().x, |