diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-06 18:04:52 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-06 18:04:52 +0200 |
commit | d5e76471ae48bd3a31edb987d1c5366e7a67b3e2 (patch) | |
tree | 07a8ff3df033c62c58b6d27dfb94227e92b384c9 /src/peds/Ped.cpp | |
parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
parent | CSphere and CBox for CColModel (diff) | |
download | re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.gz re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.bz2 re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.lz re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.xz re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.zst re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.zip |
Diffstat (limited to 'src/peds/Ped.cpp')
-rw-r--r-- | src/peds/Ped.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index c8b0b922..7286e677 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -9548,7 +9548,7 @@ CPed::ProcessControl(void) { CBaseModelInfo *collidingModel = CModelInfo::GetModelInfo(collidingEnt->GetModelIndex()); CColModel *collidingCol = collidingModel->GetColModel(); - if (collidingEnt->IsObject() && ((CObject*)collidingEnt)->m_nSpecialCollisionResponseCases != COLLRESPONSE_CHANGE_THEN_SMASH + if (collidingEnt->IsObject() && ((CObject*)collidingEnt)->m_nSpecialCollisionResponseCases != COLLRESPONSE_FENCEPART || collidingCol->boundingBox.max.x < 3.0f && collidingCol->boundingBox.max.y < 3.0f) { @@ -16931,7 +16931,7 @@ CPed::SpawnFlyingComponent(int pedNode, int8 direction) obj->ObjectCreatedBy = TEMP_OBJECT; obj->bIsStatic = false; obj->bIsPickup = false; - obj->m_nSpecialCollisionResponseCases = COLLRESPONSE_SPLIT_MODEL; + obj->m_nSpecialCollisionResponseCases = COLLRESPONSE_SMALLBOX; // life time - the more objects the are, the shorter this one will live CObject::nNoTempObjects++; |