The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-11-23 17:49:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Nikolay Korolev 2021-01-05 00:48:25 +03:00
parent 601f77b5c8
commit 6fa081e004
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/control/Script2.cpp
View File

@ -1142,6 +1142,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
pPed->SetPosition(pVehicle->GetPosition()); pPed->SetPosition(pVehicle->GetPosition());
pPed->SetOrientation(0.0f, 0.0f, 0.0f); pPed->SetOrientation(0.0f, 0.0f, 0.0f);
CPopulation::ms_nTotalMissionPeds++; CPopulation::ms_nTotalMissionPeds++;
CWorld::Add(pPed);
if (ScriptParams[3] >= 0) if (ScriptParams[3] >= 0)
pVehicle->AddPassenger(pPed, ScriptParams[3]); pVehicle->AddPassenger(pPed, ScriptParams[3]);
else else
@ -1149,12 +1150,10 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
pPed->m_pMyVehicle = pVehicle; pPed->m_pMyVehicle = pVehicle;
pPed->m_pMyVehicle->RegisterReference((CEntity**)&pPed->m_pMyVehicle); pPed->m_pMyVehicle->RegisterReference((CEntity**)&pPed->m_pMyVehicle);
pPed->bInVehicle = true; pPed->bInVehicle = true;
pVehicle->SetStatus(STATUS_PHYSICS);
pPed->SetPedState(PED_DRIVING); pPed->SetPedState(PED_DRIVING);
pPed->bUsesCollision = false; pPed->bUsesCollision = false;
pPed->AddInCarAnims(pVehicle, false); pPed->AddInCarAnims(pVehicle, false);
pPed->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pPed->GetPosition()); pPed->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pPed->GetPosition());
CWorld::Add(pPed);
ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPed); ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPed);
StoreParameters(&m_nIp, 1); StoreParameters(&m_nIp, 1);
if (m_bIsMissionScript) if (m_bIsMissionScript)

4
src/vehicles/Vehicle.cpp
View File

@ -1876,7 +1876,7 @@ CVehicle::AddPassenger(CPed *passenger)
int i; int i;
if(IsBike()) if(IsBike())
ApplyTurnForce(-0.2f*passenger->m_fMass * GetUp(), -0.1f*GetForward()); ApplyTurnForce(-0.02f*passenger->m_fMass * GetUp(), -0.1f*GetForward());
else else
ApplyTurnForce(0.0f, 0.0f, -0.2f*passenger->m_fMass, ApplyTurnForce(0.0f, 0.0f, -0.2f*passenger->m_fMass,
passenger->GetPosition().x - GetPosition().x, passenger->GetPosition().x - GetPosition().x,
@ -1899,7 +1899,7 @@ CVehicle::AddPassenger(CPed *passenger, uint8 n)
return AddPassenger(passenger); return AddPassenger(passenger);
if(IsBike()) if(IsBike())
ApplyTurnForce(-0.2f*passenger->m_fMass * GetUp(), -0.1f*GetForward()); ApplyTurnForce(-0.02f*passenger->m_fMass * GetUp(), -0.1f*GetForward());
else else
ApplyTurnForce(0.0f, 0.0f, -0.2f*passenger->m_fMass, ApplyTurnForce(0.0f, 0.0f, -0.2f*passenger->m_fMass,
passenger->GetPosition().x - GetPosition().x, passenger->GetPosition().x - GetPosition().x,