diff options
author | aap <aap@papnet.eu> | 2019-07-31 23:57:18 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-07-31 23:57:18 +0200 |
commit | 78c15c4828a540fd6ad4f1816b8cc9610409f740 (patch) | |
tree | 800fc93cb0226accb1806a8104bc3eccfb4f71f7 /src/modelinfo | |
parent | Merge branch 'master' of github.com:GTAmodding/re3 (diff) | |
download | re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar.gz re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar.bz2 re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar.lz re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar.xz re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar.zst re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.zip |
Diffstat (limited to '')
-rw-r--r-- | src/modelinfo/VehicleModelInfo.cpp | 7 | ||||
-rw-r--r-- | src/modelinfo/VehicleModelInfo.h | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp index b412adcf..c031b76e 100644 --- a/src/modelinfo/VehicleModelInfo.cpp +++ b/src/modelinfo/VehicleModelInfo.cpp @@ -13,6 +13,7 @@ #include "Vehicle.h" #include "Automobile.h" #include "Train.h" +#include "Plane.h" #include "ModelIndices.h" #include "ModelInfo.h" @@ -110,9 +111,9 @@ RwObjectNameIdAssocation heliIds[] = { RwObjectNameIdAssocation planeIds[] = { { "wheel_front_dummy", 2, 0 }, { "wheel_rear_dummy", 3, 0 }, - { "light_tailplane", 2, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, - { "light_left", 0, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, - { "light_right", 1, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "light_tailplane", PLANE_POS_LIGHT_TAIL, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "light_left", PLANE_POS_LIGHT_LEFT, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "light_right", PLANE_POS_LIGHT_RIGHT, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, { nil, 0, 0 } }; diff --git a/src/modelinfo/VehicleModelInfo.h b/src/modelinfo/VehicleModelInfo.h index b5399d44..1a6d6a55 100644 --- a/src/modelinfo/VehicleModelInfo.h +++ b/src/modelinfo/VehicleModelInfo.h @@ -57,7 +57,10 @@ public: uint8 m_lastColour2; char m_gameName[32]; int32 m_vehicleType; - int32 m_wheelId; + union { + int32 m_wheelId; + int32 m_planeLodId; + }; float m_wheelScale; int32 m_numDoors; int32 m_handlingId; |