diff options
| author | aap <aap@papnet.eu> | 2020-05-06 17:13:46 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-06 17:14:34 +0200 |
| commit | c11912a8ecf13bb664d8ee3dba1ac55eb363176f (patch) | |
| tree | 7fc7cfc90b7e9a0f67ceed13721f53cefecdea78 /src/peds | |
| parent | Merge branch 'master' into miami (diff) | |
| download | re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.gz re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.bz2 re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.lz re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.xz re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.zst re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.zip | |
Diffstat (limited to 'src/peds')
| -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 2048d805..0a0a807d 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++; |