diff options
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/CivilianPed.cpp | 6 | ||||
| -rw-r--r-- | src/peds/Population.cpp | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp index 74a7c9ba..18a0e2a3 100644 --- a/src/peds/CivilianPed.cpp +++ b/src/peds/CivilianPed.cpp @@ -34,7 +34,11 @@ CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype) m_bJustStoleACar = false; m_bStealCarEvenIfThereIsSomeoneInIt = false; for (int i = 0; i < ARRAY_SIZE(m_nStealWishList); i++) { - uint32 randomCarModel = CGeneral::GetRandomNumberInRange(MI_LANDSTAL, MI_LAST_VEHICLE + 1); +#ifdef FIX_BUGS + uint32 randomCarModel = CGeneral::GetRandomNumberInRange(MI_LANDSTAL, MI_LAST_VEHICLE); +#else + uint32 randomCarModel = CGeneral::GetRandomNumberInRange(MI_LANDSTAL, MI_LANDSTAL + VEHICLEMODELSIZE); +#endif if (CModelInfo::IsCarModel(randomCarModel) || CModelInfo::IsBikeModel(randomCarModel)) m_nStealWishList[i] = randomCarModel; else diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp index d52c8c7c..7314080b 100644 --- a/src/peds/Population.cpp +++ b/src/peds/Population.cpp @@ -767,13 +767,13 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree CVector toyPos(newPed->GetPosition()); float waterLevel; if (CWaterLevel::GetGroundLevel(toyPos, &waterLevel, nil, 30.0f)) { - toyPos.z = 0.004f + waterLevel; - CEntity *toy = CWaterLevel::CreateBeachToy(toyPos, BEACHTOY_11); + toyPos.z = 0.04f + waterLevel; + CEntity *toy = CWaterLevel::CreateBeachToy(toyPos, BEACHTOY_ANY_TOWEL); if (toy) toy->SetHeading(heading); if (!(CGeneral::GetRandomNumber() & 3)) { - CWaterLevel::CreateBeachToy(toyPos + CVector(CGeneral::GetRandomNumberInRange(-2.f, 2.f), CGeneral::GetRandomNumberInRange(-2.f, 2.f), 0.f), BEACHTOY_6); + CWaterLevel::CreateBeachToy(toyPos + CVector(CGeneral::GetRandomNumberInRange(-2.f, 2.f), CGeneral::GetRandomNumberInRange(-2.f, 2.f), 0.f), BEACHTOY_LOTION); } } } else { @@ -1793,4 +1793,4 @@ CPopulation::PlaceMallPedsAsStationaryGroup(CVector const& coors, int32 group) } } } -}
\ No newline at end of file +} |