diff options
| author | aap <aap@papnet.eu> | 2020-05-22 23:55:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 23:55:29 +0200 |
| commit | 8fb72afac96434153d948d91685f7291e9b946d9 (patch) | |
| tree | 25d4899924a591e4dafd44caf488dd9bf62db95e /src/peds/Ped.cpp | |
| parent | Merge pull request #579 from Xinerki/miami (diff) | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-8fb72afac96434153d948d91685f7291e9b946d9.tar re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.gz re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.bz2 re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.lz re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.xz re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.zst re3-8fb72afac96434153d948d91685f7291e9b946d9.zip | |
Diffstat (limited to 'src/peds/Ped.cpp')
| -rw-r--r-- | src/peds/Ped.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 539bbfaf..081ea91e 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -603,14 +603,25 @@ CPed::CPed(uint32 pedType) : m_pedIK(this) bCarPassenger = false; bMiamiViceCop = false; bMoneyHasBeenGivenByScript = false; + bHasBeenPhotographed = false; bIsDrowning = false; - bCanDrownInWater = true; + bDrownsInWater = true; #ifdef VC_PED_PORTS bHeadStuckInCollision = false; #endif bIsPlayerFriend = true; bDeadPedInFrontOfCar = false; + bStayInCarOnJack = false; + + bDontFight = false; + bDoomAim = true; + bCanBeShotInVehicle = true; + bIgnoreThreatsBehindObjects = false; + + bNeverEverTargetThisPed = false; + + bBoughtIceCream = false; if ((CGeneral::GetRandomNumber() & 3) == 0) bHasACamera = true; @@ -4116,7 +4127,7 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi if (DyingOrDead()) return false; - if (method == WEAPONTYPE_DROWNING && !bCanDrownInWater) + if (method == WEAPONTYPE_DROWNING && !bDrownsInWater) return false; if (!bUsesCollision && (!bInVehicle || m_nPedState != PED_DRIVING) && method != WEAPONTYPE_DROWNING) |