diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/AnimViewer.cpp | 2 | ||||
| -rw-r--r-- | src/core/FileLoader.cpp | 2 | ||||
| -rw-r--r-- | src/core/Lists.h | 2 | ||||
| -rw-r--r-- | src/core/World.cpp | 2 | ||||
| -rw-r--r-- | src/core/main.cpp | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp index 86b22ec5..84de3fe8 100644 --- a/src/core/AnimViewer.cpp +++ b/src/core/AnimViewer.cpp @@ -255,7 +255,7 @@ CAnimViewer::Update(void) if (modelInfo->m_type == MITYPE_VEHICLE) { CVehicleModelInfo* veh = (CVehicleModelInfo*)modelInfo; - if (veh->m_vehicleType != VEHICLE_TYPE_CAR) { + if (veh->m_vehicleType != VEHICLE_TYPE_AUTOMOBILE) { // Not ready yet /* if (veh->m_vehicleType == VEHICLE_TYPE_BOAT) { diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index 6f3b0971..f7b69dea 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -738,7 +738,7 @@ CFileLoader::LoadVehicleObject(const char *line) if(strncmp(type, "car", 4) == 0){ mi->m_wheelId = misc; mi->m_wheelScale = wheelScale; - mi->m_vehicleType = VEHICLE_TYPE_CAR; + mi->m_vehicleType = VEHICLE_TYPE_AUTOMOBILE; }else if(strncmp(type, "boat", 5) == 0){ mi->m_vehicleType = VEHICLE_TYPE_BOAT; }else if(strncmp(type, "train", 6) == 0){ diff --git a/src/core/Lists.h b/src/core/Lists.h index 7572e882..ecf24740 100644 --- a/src/core/Lists.h +++ b/src/core/Lists.h @@ -1,5 +1,7 @@ #pragma once +#include "common.h" + class CPtrNode { public: diff --git a/src/core/World.cpp b/src/core/World.cpp index 5dea09bd..46d36348 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -793,7 +793,7 @@ CWorld::TestSphereAgainstSectorList(CPtrList &list, CVector spherePos, float rad *eCol, &ms_testSpherePoint, nil, nil); if (collidedSpheres != 0 || - (e->IsVehicle() && ((CVehicle*)e)->m_vehType == VEHICLE_TYPE_CAR && + (e->IsVehicle() && ((CVehicle*)e)->m_vehType == VEHICLE_TYPE_AUTOMOBILE && e->m_modelIndex != MI_DODO && radius + eCol->boundingBox.max.x > distance)) { return e; } diff --git a/src/core/main.cpp b/src/core/main.cpp index 8985d56a..3c9556d4 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -339,7 +339,7 @@ void RenderEffects(void) { CGlass::Render(); - CWaterCannons::Render(); + CWaterCannon::Render(); CSpecialFX::Render(); CShadows::RenderStaticShadows(); CShadows::RenderStoredShadows(); |