diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2019-07-18 04:41:57 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2019-07-18 15:12:46 +0200 |
| commit | d0fd14cb1a1882753aee9bc64a478da304247273 (patch) | |
| tree | 296ce276e6ca96d638c814abd9dfa0de609d6dae /src/peds/Ped.cpp | |
| parent | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff) | |
| download | re3-d0fd14cb1a1882753aee9bc64a478da304247273.tar re3-d0fd14cb1a1882753aee9bc64a478da304247273.tar.gz re3-d0fd14cb1a1882753aee9bc64a478da304247273.tar.bz2 re3-d0fd14cb1a1882753aee9bc64a478da304247273.tar.lz re3-d0fd14cb1a1882753aee9bc64a478da304247273.tar.xz re3-d0fd14cb1a1882753aee9bc64a478da304247273.tar.zst re3-d0fd14cb1a1882753aee9bc64a478da304247273.zip | |
Diffstat (limited to 'src/peds/Ped.cpp')
| -rw-r--r-- | src/peds/Ped.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 47934a24..924098bc 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -3419,11 +3419,11 @@ CPed::InflictDamage(CEntity* damagedBy, eWeaponType method, float damage, ePedPi willLinger = false; } else { switch (pedPiece) { - case PEDPIECE_NONE: + case PEDPIECE_TORSO: willLinger = false; dieAnim = ANIM_KO_SHOT_FRONT1; break; - case PEDPIECE_BODY: + case PEDPIECE_MID: willLinger = false; dieAnim = ANIM_KO_SHOT_STOM; break; @@ -3518,9 +3518,9 @@ CPed::InflictDamage(CEntity* damagedBy, eWeaponType method, float damage, ePedPi switch (random) { case 0: if ((pedPiece != PEDPIECE_LEFTARM || random <= 1) - && (pedPiece != PEDPIECE_BODY || random != 1)) { + && (pedPiece != PEDPIECE_MID || random != 1)) { if (pedPiece == PEDPIECE_RIGHTARM && random > 1 - || pedPiece == PEDPIECE_BODY && random == 2) + || pedPiece == PEDPIECE_MID && random == 2) dieAnim = ANIM_KO_SPIN_L; else @@ -3537,9 +3537,9 @@ CPed::InflictDamage(CEntity* damagedBy, eWeaponType method, float damage, ePedPi break; case 2: if ((pedPiece != PEDPIECE_LEFTARM || random <= 1) - && (pedPiece != PEDPIECE_BODY || random != 1)) { + && (pedPiece != PEDPIECE_MID || random != 1)) { if ((pedPiece != PEDPIECE_RIGHTARM || random <= 1) - && (pedPiece != PEDPIECE_BODY || random != 2)) { + && (pedPiece != PEDPIECE_MID || random != 2)) { dieAnim = ANIM_KO_SKID_BACK; } else { dieAnim = ANIM_KD_RIGHT; @@ -3697,12 +3697,12 @@ CPed::SetGetUp(void) m_ped_flagE20 = false; if (IsPlayer()) - InflictDamage(nil, WEAPONTYPE_RUNOVERBYCAR, CTimer::GetTimeStep(), PEDPIECE_NONE, 0); + InflictDamage(nil, WEAPONTYPE_RUNOVERBYCAR, CTimer::GetTimeStep(), PEDPIECE_TORSO, 0); else { if (!CPad::GetPad(0)->ArePlayerControlsDisabled()) return; - InflictDamage(nil, WEAPONTYPE_RUNOVERBYCAR, 1000.0f, PEDPIECE_NONE, 0); + InflictDamage(nil, WEAPONTYPE_RUNOVERBYCAR, 1000.0f, PEDPIECE_TORSO, 0); } return; } |