diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-18 20:20:44 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-18 20:20:44 +0100 |
| commit | 4f36a1fb770653f26dd4fb3f89a6596015fbb4af (patch) | |
| tree | acefb8b0fb1d2ffbf2136e643d327a54a6b27a01 /src/vehicles | |
| parent | Merge remote-tracking branch 'upstream/lcs' into lcs (diff) | |
| download | re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.gz re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.bz2 re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.lz re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.xz re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.zst re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Cranes.cpp | 22 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.h | 2 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp index ce254100..8f23836d 100644 --- a/src/vehicles/Cranes.cpp +++ b/src/vehicles/Cranes.cpp @@ -14,7 +14,7 @@ // --MIAMI: file done -#define MAX_DISTANCE_TO_FIND_CRANE (10.0f) +#define MAX_DISTANCE_TO_FIND_CRANE (100.0f) #define CRANE_UPDATE_RADIUS (300.0f) #define CRANE_MOVEMENT_PROCESSING_RADIUS (150.0f) #define CRUSHER_Z (-0.951f) @@ -52,28 +52,18 @@ void CCranes::InitCranes(void) for (int j = 0; j < NUMSECTORS_Y; j++) { for (CPtrNode* pNode = CWorld::GetSector(i, j)->m_lists[ENTITYLIST_BUILDINGS].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_4 == pEntity->GetModelIndex() || - MODELID_CRANE_5 == pEntity->GetModelIndex() || - MODELID_CRANE_6 == pEntity->GetModelIndex()) + if (MI_LCS_CRANE01 == pEntity->GetModelIndex()) AddThisOneCrane(pEntity); } } } -/* // TODO(LCS) - for (CPtrNode* pNode = CWorld::GetBigBuildingList(LEVEL_MAINLAND).first; pNode; pNode = pNode->next) { + // TODO(LCS) + for (CPtrNode* pNode = CWorld::GetBigBuildingList(LEVEL_INDUSTRIAL).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_4 == pEntity->GetModelIndex() || - MODELID_CRANE_5 == pEntity->GetModelIndex() || - MODELID_CRANE_6 == pEntity->GetModelIndex()) + if (MI_LCS_CRANE01 == pEntity->GetModelIndex()) AddThisOneCrane(pEntity); } -*/ + } void CCranes::AddThisOneCrane(CEntity* pEntity) diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index 29a4eea1..e5cd3f62 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -245,6 +245,8 @@ public: #endif uint8 bDriverLastFrame : 1; + uint8 bAllowGarageToStore : 1; // <- many LCS flags before + int8 m_numPedsUseItAsCover; uint8 m_nAmmoInClip; // Used to make the guns on boat do a reload (20 by default) int8 m_nPacManPickupsCarried; |