diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-16 00:50:45 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-16 00:50:45 +0200 |
| commit | 21329b8440ef87bbb34e02bffacacbe35b0f632d (patch) | |
| tree | 6fc11fcadb5b04ba7309f32cc64eba6d14611287 /src/core/World.cpp | |
| parent | ped attractors done (diff) | |
| parent | Merge pull request #550 from erorcun/miami (diff) | |
| download | re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar.gz re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar.bz2 re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar.lz re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar.xz re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.tar.zst re3-21329b8440ef87bbb34e02bffacacbe35b0f632d.zip | |
Diffstat (limited to 'src/core/World.cpp')
| -rw-r--r-- | src/core/World.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp index 0392ba2f..ef124c07 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -2048,9 +2048,12 @@ CWorld::Process(void) movingPed->EnteringCar()) { CVehicle *movingCar = movingPed->m_pMyVehicle; if(movingCar) { +#ifdef GTA_TRAIN if(movingCar->IsTrain()) { movingPed->SetPedPositionInTrain(); - } else { + } else +#endif + { switch(movingPed->m_nPedState) { case PED_ENTER_CAR: case PED_CARJACK: movingPed->EnterCar(); break; @@ -2235,6 +2238,7 @@ CWorld::UseDetonator(CEntity *pEntity) pVehicle->m_pBlowUpEntity->RegisterReference(&pVehicle->m_pBlowUpEntity); } } + CProjectileInfo::RemoveDetonatorProjectiles(); } bool |