summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2019-10-25 18:39:26 +0200
committerFilip Gawin <filip.gawin@zoho.com>2019-10-26 13:05:00 +0200
commit8808e6fdfe5604022a64e72df3ee60d8ed10e9d6 (patch)
tree02a3e0e3dca2f3d52cb45017ad50d627ffec9841 /src/core
parentAudio fixes from Serg (diff)
downloadre3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar
re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar.gz
re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar.bz2
re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar.lz
re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar.xz
re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar.zst
re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/AnimViewer.cpp2
-rw-r--r--src/core/FileLoader.cpp2
-rw-r--r--src/core/World.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp
index 84de3fe8..86b22ec5 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_AUTOMOBILE) {
+ if (veh->m_vehicleType != VEHICLE_TYPE_CAR) {
// Not ready yet
/* if (veh->m_vehicleType == VEHICLE_TYPE_BOAT)
{
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index f7b69dea..6f3b0971 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_AUTOMOBILE;
+ mi->m_vehicleType = VEHICLE_TYPE_CAR;
}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/World.cpp b/src/core/World.cpp
index 46d36348..5dea09bd 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_AUTOMOBILE &&
+ (e->IsVehicle() && ((CVehicle*)e)->m_vehType == VEHICLE_TYPE_CAR &&
e->m_modelIndex != MI_DODO && radius + eCol->boundingBox.max.x > distance)) {
return e;
}