archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-23 20:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync with upstream

Browse Source
This commit is contained in:
Nikolay Korolev
2020-05-07 16:59:40 +03:00
parent 40888e9486 8bb22b2ad8
commit 5780b4503e
38 changed files with 638 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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){
@ -1528,7 +1528,8 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
if(A->GetModelIndex() == MI_RCBANDIT)
adhesion *= 0.2f;
else if(IsBoatModel(A->GetModelIndex())){
// TODO(MIAMI): check this
else if(A->IsVehicle() && ((CVehicle*)A)->IsBoat()){
if(aColPoints[i].normal.z > 0.6f){
if(CSurfaceTable::GetAdhesionGroup(aColPoints[i].surfaceB) == ADHESIVE_LOOSE)
adhesion *= 3.0f;