archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-17 18:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync with upstream

Browse Source
This commit is contained in:
Nikolay Korolev
2020-05-16 01:50:45 +03:00
parent 08b2138c7e 8ff72f0728
commit 21329b8440
38 changed files with 2383 additions and 1316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/World.cpp
View File

@ -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