diff options
author | aap <aap@papnet.eu> | 2020-05-06 17:13:46 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-05-06 17:13:46 +0200 |
commit | a2b89c6a18d43910e9626c23793a4935e2c0d08d (patch) | |
tree | b22ba4ad99611ddf75da0d13a6007be422ec729e /src/peds/Ped.cpp | |
parent | b4bbd91921833ce92c78a470863b4a3e441d4c8f (diff) |
sorted out object collision enums
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 56a18dab..6be4b3d7 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -9551,7 +9551,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) { @@ -16934,7 +16934,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++; |