diff options
author | aap <aap@papnet.eu> | 2020-05-22 23:58:59 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-05-22 23:58:59 +0200 |
commit | a1e4b15bcc93fa814a63e1b6ccdca50197874e5c (patch) | |
tree | f54f09c8a5f002d64ed81a2f6a7e9024d9028612 /src/peds/Ped.cpp | |
parent | CPhysical (diff) | |
parent | Merge pull request #576 from Nick007J/miami (diff) | |
download | re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar.gz re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar.bz2 re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar.lz re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar.xz re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.tar.zst re3-a1e4b15bcc93fa814a63e1b6ccdca50197874e5c.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 c84e37c7..2ab3bf48 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -604,14 +604,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; @@ -4117,7 +4128,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) |