diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-23 21:04:38 +0100 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-23 21:04:38 +0100 |
commit | d28e9a7b629fca3904336cd2d7ba74b925249fea (patch) | |
tree | c30c37726139bf7125d858f3c29e4090a2d6310e /src/vehicles | |
parent | script fixes (diff) | |
parent | txd store (diff) | |
download | re3-d28e9a7b629fca3904336cd2d7ba74b925249fea.tar re3-d28e9a7b629fca3904336cd2d7ba74b925249fea.tar.gz re3-d28e9a7b629fca3904336cd2d7ba74b925249fea.tar.bz2 re3-d28e9a7b629fca3904336cd2d7ba74b925249fea.tar.lz re3-d28e9a7b629fca3904336cd2d7ba74b925249fea.tar.xz re3-d28e9a7b629fca3904336cd2d7ba74b925249fea.tar.zst re3-d28e9a7b629fca3904336cd2d7ba74b925249fea.zip |
Diffstat (limited to 'src/vehicles')
-rw-r--r-- | src/vehicles/Automobile.cpp | 1 | ||||
-rw-r--r-- | src/vehicles/Bike.h | 1 | ||||
-rw-r--r-- | src/vehicles/Boat.cpp | 1 | ||||
-rw-r--r-- | src/vehicles/Cranes.cpp | 14 | ||||
-rw-r--r-- | src/vehicles/Vehicle.h | 6 |
5 files changed, 18 insertions, 5 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 13291d33..a4d9e5c3 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -49,6 +49,7 @@ #include "Object.h" #include "Automobile.h" #include "Bike.h" +#include "Wanted.h" bool bAllCarCheat; diff --git a/src/vehicles/Bike.h b/src/vehicles/Bike.h index 3fcf66a2..219d8872 100644 --- a/src/vehicles/Bike.h +++ b/src/vehicles/Bike.h @@ -2,6 +2,7 @@ #include "Vehicle.h" #include "Skidmarks.h" +#include "AnimManager.h" enum eBikeNodes { BIKE_NODE_NONE, diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index 6a15d53d..381d13d8 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -27,6 +27,7 @@ #include "RpAnimBlend.h" #include "Record.h" #include "Shadows.h" +#include "Wanted.h" #define INVALID_ORIENTATION (-9999.99f) diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp index c84b6732..a675fe4e 100644 --- a/src/vehicles/Cranes.cpp +++ b/src/vehicles/Cranes.cpp @@ -50,7 +50,12 @@ 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 (MI_LCS_CRANE01 == pEntity->GetModelIndex()) + 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()) AddThisOneCrane(pEntity); } } @@ -58,7 +63,12 @@ void CCranes::InitCranes(void) // TODO(LCS) for (CPtrNode* pNode = CWorld::GetBigBuildingList(LEVEL_INDUSTRIAL).first; pNode; pNode = pNode->next) { CEntity* pEntity = (CEntity*)pNode->item; - if (MI_LCS_CRANE01 == pEntity->GetModelIndex()) + 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()) AddThisOneCrane(pEntity); } diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index e5cd3f62..cebafd77 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -3,15 +3,15 @@ #include "Physical.h" #include "AutoPilot.h" #include "ModelIndices.h" -#include "AnimManager.h" -#include "Weapon.h" +#include "AnimationId.h" +#include "WeaponType.h" +#include "Collision.h" #include "HandlingMgr.h" class CPed; class CPlayerPed; class CCopPed; class CFire; -struct tHandlingData; enum { RANDOM_VEHICLE = 1, |