diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-09-29 21:53:12 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-09-30 01:41:42 +0200 |
| commit | f71953077d2412c4542e616cc9748217dfe046c7 (patch) | |
| tree | 3a3adac3c9d143686d198fff3360f8a9945cff67 /src/vehicles/Cranes.cpp | |
| parent | Merge pull request #727 from erorcun/miami (diff) | |
| download | re3-f71953077d2412c4542e616cc9748217dfe046c7.tar re3-f71953077d2412c4542e616cc9748217dfe046c7.tar.gz re3-f71953077d2412c4542e616cc9748217dfe046c7.tar.bz2 re3-f71953077d2412c4542e616cc9748217dfe046c7.tar.lz re3-f71953077d2412c4542e616cc9748217dfe046c7.tar.xz re3-f71953077d2412c4542e616cc9748217dfe046c7.tar.zst re3-f71953077d2412c4542e616cc9748217dfe046c7.zip | |
Diffstat (limited to 'src/vehicles/Cranes.cpp')
| -rw-r--r-- | src/vehicles/Cranes.cpp | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp index 83c727f5..1ab31574 100644 --- a/src/vehicles/Cranes.cpp +++ b/src/vehicles/Cranes.cpp @@ -52,17 +52,22 @@ void CCranes::InitCranes(void) CEntity* pEntity = (CEntity*)pNode->item; if (MODELID_CRANE_1 == pEntity->GetModelIndex() || MODELID_CRANE_2 == pEntity->GetModelIndex() || - MODELID_CRANE_3 == pEntity->GetModelIndex()) + MODELID_CRANE_3 == pEntity->GetModelIndex() || + MODELID_CRANE_4 == pEntity->GetModelIndex() || + MODELID_CRANE_5 == pEntity->GetModelIndex() || + MODELID_CRANE_6 == pEntity->GetModelIndex()) AddThisOneCrane(pEntity); } } } - // TODO(MIAMI): LEVEL_MAINLAND just so it compiles for (CPtrNode* pNode = CWorld::GetBigBuildingList(LEVEL_MAINLAND).first; pNode; pNode = pNode->next) { CEntity* pEntity = (CEntity*)pNode->item; if (MODELID_CRANE_1 == pEntity->GetModelIndex() || MODELID_CRANE_2 == pEntity->GetModelIndex() || - MODELID_CRANE_3 == pEntity->GetModelIndex()) + MODELID_CRANE_3 == pEntity->GetModelIndex() || + MODELID_CRANE_4 == pEntity->GetModelIndex() || + MODELID_CRANE_5 == pEntity->GetModelIndex() || + MODELID_CRANE_6 == pEntity->GetModelIndex()) AddThisOneCrane(pEntity); } } @@ -85,21 +90,7 @@ void CCranes::AddThisOneCrane(CEntity* pEntity) pCrane->m_nCraneState = CCrane::IDLE; pCrane->m_bWasMilitaryCrane = false; 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); - pHook->ObjectCreatedBy = MISSION_OBJECT; - pHook->bUsesCollision = false; - pHook->bExplosionProof = true; - pHook->bAffectedByGravity = false; - pCrane->m_pHook = pHook; - pCrane->CalcHookCoordinates(&pCrane->m_vecHookCurPos.x, &pCrane->m_vecHookCurPos.y, &pCrane->m_vecHookCurPos.z); - pCrane->SetHookMatrix(); - } - else -#endif - pCrane->m_pHook = nil; + pCrane->m_pHook = nil; NumCranes++; } |