diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-05-19 21:41:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 21:41:59 +0200 |
| commit | ada5c245a8066f180926ee873709e989f4ac7f32 (patch) | |
| tree | a3edae2913a4af9682f7ecfec53367a484c2975c /src/peds/Population.cpp | |
| parent | Merge pull request #564 from Xinerki/miami (diff) | |
| parent | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff) | |
| download | re3-ada5c245a8066f180926ee873709e989f4ac7f32.tar re3-ada5c245a8066f180926ee873709e989f4ac7f32.tar.gz re3-ada5c245a8066f180926ee873709e989f4ac7f32.tar.bz2 re3-ada5c245a8066f180926ee873709e989f4ac7f32.tar.lz re3-ada5c245a8066f180926ee873709e989f4ac7f32.tar.xz re3-ada5c245a8066f180926ee873709e989f4ac7f32.tar.zst re3-ada5c245a8066f180926ee873709e989f4ac7f32.zip | |
Diffstat (limited to 'src/peds/Population.cpp')
| -rw-r--r-- | src/peds/Population.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp index 44bedab9..338c47f0 100644 --- a/src/peds/Population.cpp +++ b/src/peds/Population.cpp @@ -461,17 +461,16 @@ CPopulation::AddPed(ePedType pedType, uint32 miOrCopType, CVector const &coors, if (ms_bGivePedsWeapons) { eWeaponType weapon; - // TODO(Miami): Look here when weapons have been ported switch (CGeneral::GetRandomNumber() & 3) { case 0: weapon = WEAPONTYPE_COLT45; break; case 1: - //weapon = WEAPONTYPE_NIGHTSTICK; - //break; + weapon = WEAPONTYPE_NIGHTSTICK; + break; case 2: - //weapon = WEAPONTYPE_GOLFCLUB; - //break; + weapon = WEAPONTYPE_GOLFCLUB; + break; case 3: weapon = WEAPONTYPE_TEC9; break; @@ -1093,8 +1092,7 @@ CPopulation::AddDeadPedInFrontOfCar(const CVector& pos, CVehicle* pCulprit) return nil; CPed* pPed = CPopulation::AddPed(PEDTYPE_CIVMALE, MI_MALE01, pos); // TODO(MIAMI): 4th parameter pPed->SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f); - //TODO(MIAMI): uncomment - //pPed->m_nPedMoney = 0; + pPed->m_nPedMoney = 0; pPed->bDeadPedInFrontOfCar = true; pPed->m_vehicleInAccident = pCulprit; pCulprit->RegisterReference((CEntity**)&pPed->m_vehicleInAccident); @@ -1108,7 +1106,7 @@ CPopulation::AddDeadPedInFrontOfCar(const CVector& pos, CVehicle* pCulprit) } } } - CColPoint colpts[32]; + CColPoint colpts[MAX_COLLISION_POINTS]; if (CCollision::ProcessColModels(pCulprit->GetMatrix(), *pCulprit->GetColModel(), pPed->GetMatrix(), *pPed->GetColModel(), colpts, nil, nil)) { CWorld::Remove(pPed); delete pPed; |