summaryrefslogtreecommitdiffstats
path: root/src/peds/Population.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-05-19 16:39:19 +0200
committereray orçunus <erayorcunus@gmail.com>2020-05-19 16:43:16 +0200
commita6972714b7ce5b7834e55a3b23acf28cf51a78ff (patch)
tree8d74d2f68371cdfca7b6ef9336502bf6ebae254e /src/peds/Population.cpp
parentMerge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff)
downloadre3-a6972714b7ce5b7834e55a3b23acf28cf51a78ff.tar
re3-a6972714b7ce5b7834e55a3b23acf28cf51a78ff.tar.gz
re3-a6972714b7ce5b7834e55a3b23acf28cf51a78ff.tar.bz2
re3-a6972714b7ce5b7834e55a3b23acf28cf51a78ff.tar.lz
re3-a6972714b7ce5b7834e55a3b23acf28cf51a78ff.tar.xz
re3-a6972714b7ce5b7834e55a3b23acf28cf51a78ff.tar.zst
re3-a6972714b7ce5b7834e55a3b23acf28cf51a78ff.zip
Diffstat (limited to '')
-rw-r--r--src/peds/Population.cpp14
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;