mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-15 13:44:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse source
This commit is contained in:
Sergeanur 2020-05-07 14:32:41 +03:00
commit 7dc649ede6
4 changed files with 110 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/entities/Physical.cpp
View file

@ -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){