diff options
Diffstat (limited to 'src/modelinfo')
| -rw-r--r-- | src/modelinfo/VehicleModelInfo.cpp | 23 | ||||
| -rw-r--r-- | src/modelinfo/VehicleModelInfo.h | 5 |
2 files changed, 17 insertions, 11 deletions
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp index 33e7195b..c031b76e 100644 --- a/src/modelinfo/VehicleModelInfo.cpp +++ b/src/modelinfo/VehicleModelInfo.cpp @@ -11,6 +11,9 @@ #include "FileMgr.h" #include "World.h" #include "Vehicle.h" +#include "Automobile.h" +#include "Train.h" +#include "Plane.h" #include "ModelIndices.h" #include "ModelInfo.h" @@ -84,13 +87,13 @@ RwObjectNameIdAssocation boatIds[] = { }; RwObjectNameIdAssocation trainIds[] = { - { "door_lhs_dummy", 1, VEHICLE_FLAG_LEFT | VEHICLE_FLAG_COLLAPSE }, - { "door_rhs_dummy", 2, VEHICLE_FLAG_LEFT | VEHICLE_FLAG_COLLAPSE }, - { "light_front", 0, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, - { "light_rear", 1, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, - { "ped_left_entry", 2, VEHICLE_FLAG_DOOR | VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, - { "ped_mid_entry", 3, VEHICLE_FLAG_DOOR | VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, - { "ped_right_entry", 4, VEHICLE_FLAG_DOOR | VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "door_lhs_dummy", TRAIN_DOOR_LHS, VEHICLE_FLAG_LEFT | VEHICLE_FLAG_COLLAPSE }, + { "door_rhs_dummy", TRAIN_DOOR_RHS, VEHICLE_FLAG_LEFT | VEHICLE_FLAG_COLLAPSE }, + { "light_front", TRAIN_POS_LIGHT_FRONT, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "light_rear", TRAIN_POS_LIGHT_REAR, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "ped_left_entry", TRAIN_POS_LEFT_ENTRY, VEHICLE_FLAG_DOOR | VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "ped_mid_entry", TRAIN_POS_MID_ENTRY, VEHICLE_FLAG_DOOR | VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "ped_right_entry", TRAIN_POS_RIGHT_ENTRY, VEHICLE_FLAG_DOOR | VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, { nil, 0, 0 } }; @@ -108,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; |