diff options
| author | aap <aap@papnet.eu> | 2020-05-20 12:41:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 12:41:12 +0200 |
| commit | fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b (patch) | |
| tree | b32e29a80a2bb4c4692ed6dccef9b8c5e7f81185 /src/vehicles | |
| parent | Merge pull request #568 from Nick007J/miami (diff) | |
| parent | CEntity and friends (diff) | |
| download | re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.gz re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.bz2 re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.lz re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.xz re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.zst re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Cranes.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/HandlingMgr.cpp | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 524067ca..ae78c93e 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -2192,6 +2192,7 @@ CAutomobile::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints) phys->RegisterReference((CEntity**)&m_aGroundPhysical[i]); m_aGroundOffset[i] = m_aWheelColPoints[i].point - phys->GetPosition(); +#if 0 if(phys->GetModelIndex() == MI_BODYCAST && GetStatus() == STATUS_PLAYER){ // damage body cast float speed = m_vecMoveSpeed.MagnitudeSqr(); @@ -2208,6 +2209,7 @@ CAutomobile::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints) phys->AddToMovingList(); } } +#endif } m_nSurfaceTouched = m_aWheelColPoints[i].surfaceB; diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp index 043f1c73..5a165c00 100644 --- a/src/vehicles/Cranes.cpp +++ b/src/vehicles/Cranes.cpp @@ -88,6 +88,7 @@ void CCranes::AddThisOneCrane(CEntity* pEntity) if (pCrane->m_nAudioEntity >= 0) DMAudio.SetEntityStatus(pCrane->m_nAudioEntity, 1); pCrane->m_bIsTop = (MODELID_CRANE_1 != pEntity->GetModelIndex()); +#if 0 // Is this used to avoid military crane? if (pCrane->m_bIsTop || pEntity->GetPosition().y > 0.0f) { CObject* pHook = new CObject(MI_MAGNET, false); @@ -100,6 +101,7 @@ void CCranes::AddThisOneCrane(CEntity* pEntity) pCrane->SetHookMatrix(); } else +#endif pCrane->m_pHook = nil; NumCranes++; } diff --git a/src/vehicles/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp index 51e2604c..3d5d4e77 100644 --- a/src/vehicles/HandlingMgr.cpp +++ b/src/vehicles/HandlingMgr.cpp @@ -4,6 +4,8 @@ #include "FileMgr.h" #include "HandlingMgr.h" +//--MIAMI: done + cHandlingDataMgr mod_HandlingManager; const char *HandlingFilename = "HANDLING.CFG"; |