diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-07 15:59:40 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-07 15:59:40 +0200 |
| commit | 5780b4503eb7172a1beee05de9513374306c26ec (patch) | |
| tree | 71503475e494e238d9fcb725a23f8f75e8150ea7 /src/peds | |
| parent | car control and friends (diff) | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| download | re3-5780b4503eb7172a1beee05de9513374306c26ec.tar re3-5780b4503eb7172a1beee05de9513374306c26ec.tar.gz re3-5780b4503eb7172a1beee05de9513374306c26ec.tar.bz2 re3-5780b4503eb7172a1beee05de9513374306c26ec.tar.lz re3-5780b4503eb7172a1beee05de9513374306c26ec.tar.xz re3-5780b4503eb7172a1beee05de9513374306c26ec.tar.zst re3-5780b4503eb7172a1beee05de9513374306c26ec.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Gangs.cpp | 14 | ||||
| -rw-r--r-- | src/peds/Ped.cpp | 4 | ||||
| -rw-r--r-- | src/peds/Population.cpp | 3 |
3 files changed, 11 insertions, 10 deletions
diff --git a/src/peds/Gangs.cpp b/src/peds/Gangs.cpp index 8859e61e..2a075e52 100644 --- a/src/peds/Gangs.cpp +++ b/src/peds/Gangs.cpp @@ -15,13 +15,13 @@ CGangInfo::CGangInfo() : void CGangs::Initialise(void) { - Gang[GANG_MAFIA].m_nVehicleMI = MI_MAFIA; - Gang[GANG_TRIAD].m_nVehicleMI = MI_BELLYUP; - Gang[GANG_DIABLOS].m_nVehicleMI = MI_DIABLOS; - Gang[GANG_YAKUZA].m_nVehicleMI = MI_YAKUZA; - Gang[GANG_YARDIE].m_nVehicleMI = MI_YARDIE; - Gang[GANG_COLUMB].m_nVehicleMI = MI_COLUMB; - Gang[GANG_HOODS].m_nVehicleMI = MI_HOODS; + Gang[GANG_MAFIA].m_nVehicleMI = -1; + Gang[GANG_TRIAD].m_nVehicleMI = -1; + Gang[GANG_DIABLOS].m_nVehicleMI = -1; + Gang[GANG_YAKUZA].m_nVehicleMI = -1; + Gang[GANG_YARDIE].m_nVehicleMI = -1; + Gang[GANG_COLUMB].m_nVehicleMI = -1; + Gang[GANG_HOODS].m_nVehicleMI = -1; Gang[GANG_7].m_nVehicleMI = -1; Gang[GANG_8].m_nVehicleMI = -1; #ifdef FIX_BUGS diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 042596de..3b95dfdd 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -11976,7 +11976,7 @@ CPed::RegisterThreatWithGangPeds(CEntity *attacker) } if (attackerPed && attackerPed->IsPlayer() && (attackerPed->m_nPedState == PED_CARJACK || attackerPed->bInVehicle)) { - if (!attackerPed->m_pMyVehicle || attackerPed->m_pMyVehicle->GetModelIndex() != MI_TOYZ) { + if (!attackerPed->m_pMyVehicle || attackerPed->m_pMyVehicle->GetModelIndex() != MI_TOPFUN) { int16 lastVehicle; CEntity *vehicles[8]; CWorld::FindObjectsInRange(GetPosition(), 30.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false); @@ -15670,7 +15670,7 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode) } else { if (veh->GetUp().z > -0.8f) { bool addDoorSmoke = false; - if (veh->GetModelIndex() == MI_YARDIE) + if (veh->GetModelIndex() == MI_VOODOO) addDoorSmoke = true; switch (m_vehEnterType) { diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp index 53cf334f..3eb13b1b 100644 --- a/src/peds/Population.cpp +++ b/src/peds/Population.cpp @@ -749,7 +749,8 @@ CPopulation::AddPedInCar(CVehicle* car) break; case MI_TAXI: case MI_CABBIE: - case MI_BORGNINE: + case MI_ZEBRA: + case MI_KAUFMAN: if (CGeneral::GetRandomTrueFalse()) { pedType = PEDTYPE_CIVMALE; preferredModel = MI_TAXI_D; |