diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-05-07 13:32:41 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-07 13:32:41 +0200 |
commit | 7dc649ede6b2e16107419da4e658103a2f8b84f5 (patch) | |
tree | 6540299dae4f7dacd7ba1d1b8385cd925e7415bb /src/entities | |
parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
parent | Fix GetDistanceSquared (diff) | |
download | re3-7dc649ede6b2e16107419da4e658103a2f8b84f5.tar re3-7dc649ede6b2e16107419da4e658103a2f8b84f5.tar.gz re3-7dc649ede6b2e16107419da4e658103a2f8b84f5.tar.bz2 re3-7dc649ede6b2e16107419da4e658103a2f8b84f5.tar.lz re3-7dc649ede6b2e16107419da4e658103a2f8b84f5.tar.xz re3-7dc649ede6b2e16107419da4e658103a2f8b84f5.tar.zst re3-7dc649ede6b2e16107419da4e658103a2f8b84f5.zip |
Diffstat (limited to 'src/entities')
-rw-r--r-- | src/entities/Physical.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index c5c34e1e..22b391e8 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -317,8 +317,8 @@ int32 CPhysical::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints) { int32 numSpheres = CCollision::ProcessColModels( - GetMatrix(), *CModelInfo::GetModelInfo(GetModelIndex())->GetColModel(), - ent->GetMatrix(), *CModelInfo::GetModelInfo(ent->GetModelIndex())->GetColModel(), + GetMatrix(), *GetColModel(), + ent->GetMatrix(), *ent->GetColModel(), colpoints, nil, nil); // No Lines allowed! if(numSpheres > 0){ |