diff options
| author | aap <aap@papnet.eu> | 2020-05-07 17:31:32 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-07 17:31:32 +0200 |
| commit | 3ae10c93acbf223675e032dc4b1b1193d2bc41fc (patch) | |
| tree | 64998f82fb659ae343ebf6b8da75350a0a8de10f /src/entities | |
| parent | got rid of superfluous enum; update librw (diff) | |
| parent | Fix looping collision sound (diff) | |
| download | re3-3ae10c93acbf223675e032dc4b1b1193d2bc41fc.tar re3-3ae10c93acbf223675e032dc4b1b1193d2bc41fc.tar.gz re3-3ae10c93acbf223675e032dc4b1b1193d2bc41fc.tar.bz2 re3-3ae10c93acbf223675e032dc4b1b1193d2bc41fc.tar.lz re3-3ae10c93acbf223675e032dc4b1b1193d2bc41fc.tar.xz re3-3ae10c93acbf223675e032dc4b1b1193d2bc41fc.tar.zst re3-3ae10c93acbf223675e032dc4b1b1193d2bc41fc.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 04783f31..64358cbf 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -326,8 +326,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){ |