merged master

This commit is contained in:
aap 2020-05-05 14:21:13 +02:00
commit b3b9be5e8c
29 changed files with 189 additions and 196 deletions

View file

@ -217,14 +217,14 @@ CModelInfo::GetModelInfo(const char *name, int minIndex, int maxIndex)
bool
CModelInfo::IsBoatModel(int32 id)
{
return GetModelInfo(id)->m_type == MITYPE_VEHICLE &&
return GetModelInfo(id)->GetModelType() == MITYPE_VEHICLE &&
((CVehicleModelInfo*)GetModelInfo(id))->m_vehicleType == VEHICLE_TYPE_BOAT;
}
bool
CModelInfo::IsBikeModel(int32 id)
{
return GetModelInfo(id)->m_type == MITYPE_VEHICLE &&
return GetModelInfo(id)->GetModelType() == MITYPE_VEHICLE &&
((CVehicleModelInfo*)GetModelInfo(id))->m_vehicleType == VEHICLE_TYPE_BIKE;
}