github.com/GTAmodding.re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Melee weapons(half-working), Ped and Hud bits

Browse Source
This commit is contained in:
eray orçunus
2020-05-19 17:39:19 +03:00
parent f71cfdf8ef
commit a6972714b7
19 changed files with 820 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/peds/Population.cpp
View File

@@ -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;