diff options
| author | aap <aap@papnet.eu> | 2020-05-07 13:38:22 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-07 13:38:22 +0200 |
| commit | 54662674e6376668e44968b288b2955b4df0e203 (patch) | |
| tree | fda05a05de0a6675085d58217054a6ba0cb6ea49 /src/entities/Physical.cpp | |
| parent | use water color and new water texture (diff) | |
| parent | Merge branch 'master' into miami (diff) | |
| download | re3-54662674e6376668e44968b288b2955b4df0e203.tar re3-54662674e6376668e44968b288b2955b4df0e203.tar.gz re3-54662674e6376668e44968b288b2955b4df0e203.tar.bz2 re3-54662674e6376668e44968b288b2955b4df0e203.tar.lz re3-54662674e6376668e44968b288b2955b4df0e203.tar.xz re3-54662674e6376668e44968b288b2955b4df0e203.tar.zst re3-54662674e6376668e44968b288b2955b4df0e203.zip | |
Diffstat (limited to 'src/entities/Physical.cpp')
| -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){ |