summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-10-04 21:18:33 +0200
committerGitHub <noreply@github.com>2020-10-04 21:18:33 +0200
commitea4007a13c844007b5b5ad06b6e01941cbd66e10 (patch)
tree32195602f9ba72f90ff2dbe4a2a1447f339012e1 /src/vehicles
parentsmall fix (diff)
parentMerge branch 'master' into master (diff)
downloadre3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar.gz
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar.bz2
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar.lz
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar.xz
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.tar.zst
re3-ea4007a13c844007b5b5ad06b6e01941cbd66e10.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/CarGen.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/vehicles/CarGen.cpp b/src/vehicles/CarGen.cpp
index 5de478b7..338eaba4 100644
--- a/src/vehicles/CarGen.cpp
+++ b/src/vehicles/CarGen.cpp
@@ -74,11 +74,12 @@ void CCarGenerator::DoInternalProcessing()
}
m_nVehicleHandle = CPools::GetVehiclePool()->GetIndex(pBoat);
}else{
- bool groundFound = false;
+ bool groundFound;
CVector pos = m_vecPos;
if (pos.z > -100.0f){
pos.z = CWorld::FindGroundZFor3DCoord(pos.x, pos.y, pos.z, &groundFound);
}else{
+ groundFound = false;
CColPoint cp;
CEntity* pEntity;
groundFound = CWorld::ProcessVerticalLine(CVector(pos.x, pos.y, 1000.0f), -1000.0f,
@@ -89,7 +90,12 @@ void CCarGenerator::DoInternalProcessing()
if (!groundFound) {
debug("CCarGenerator::DoInternalProcessing - can't find ground z for new car x = %f y = %f \n", m_vecPos.x, m_vecPos.y);
}else{
- CAutomobile* pCar = new CAutomobile(m_nModelIndex, PARKED_VEHICLE);
+ CAutomobile* pCar;
+
+ // So game crashes if it's bike :D
+ if (((CVehicleModelInfo*)CModelInfo::GetModelInfo(m_nModelIndex))->m_vehicleType != VEHICLE_TYPE_BIKE)
+ pCar = new CAutomobile(m_nModelIndex, PARKED_VEHICLE);
+
pCar->bIsStatic = false;
pCar->bEngineOn = false;
pos.z += pCar->GetDistanceFromCentreOfMassToBaseOfModel();