summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.cpp
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2019-10-27 04:17:30 +0100
committerFire-Head <Fire-Head@users.noreply.github.com>2019-10-27 04:17:30 +0100
commit537aaca5c200cb61928674303f7a24e3af29ad54 (patch)
tree6107f1e30d2392fb11df36d4902605810b4a6998 /src/peds/Ped.cpp
parentCGame::FinalShutdown (diff)
downloadre3-537aaca5c200cb61928674303f7a24e3af29ad54.tar
re3-537aaca5c200cb61928674303f7a24e3af29ad54.tar.gz
re3-537aaca5c200cb61928674303f7a24e3af29ad54.tar.bz2
re3-537aaca5c200cb61928674303f7a24e3af29ad54.tar.lz
re3-537aaca5c200cb61928674303f7a24e3af29ad54.tar.xz
re3-537aaca5c200cb61928674303f7a24e3af29ad54.tar.zst
re3-537aaca5c200cb61928674303f7a24e3af29ad54.zip
Diffstat (limited to 'src/peds/Ped.cpp')
-rw-r--r--src/peds/Ped.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index b0dc96cf..b0318efb 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -4647,10 +4647,10 @@ CPed::SetAttack(CEntity *victim)
CPad::GetPad(0)->ResetAverageWeapon();
if ((curWeapon->m_eWeaponFire == WEAPON_FIRE_INSTANT_HIT || GetWeapon()->m_eWeaponType == WEAPONTYPE_FLAMETHROWER)
- && TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16FIRSTPERSON_34
- && TheCamera.PlayerWeaponMode.Mode != CCam::MODE_FIRSTPERSONPEDONPC_41
+ && TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON
+ && TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON_RUNABOUT
&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER
- && TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER_RUN_AROUND
+ && TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER_RUNABOUT
&& CheckForPointBlankPeds(victimPed) != 0) {
ClearAimFlag();
@@ -9188,10 +9188,10 @@ CPed::ProcessControl(void)
if (!nearPed->bIsLooking && nearPed->m_nPedState != PED_ATTACK) {
int16 camMode = TheCamera.Cams[TheCamera.ActiveCam].Mode;
if (camMode != CCam::MODE_SNIPER
- && camMode != CCam::MODE_ROCKET
- && camMode != CCam::MODE_M16FIRSTPERSON_34
- && camMode != CCam::MODE_FIRSTPERSON
- && camMode != CCam::MODE_M16FIRSTPERSON_44
+ && camMode != CCam::MODE_ROCKETLAUNCHER
+ && camMode != CCam::MODE_M16_1STPERSON
+ && camMode != CCam::MODE_1STPERSON
+ && camMode != CCam::MODE_HELICANNON_1STPERSON
&& !TheCamera.Cams[TheCamera.ActiveCam].GetWeaponFirstPersonOn()) {
nearPed->SetLookFlag(this, true);
@@ -10330,7 +10330,7 @@ CPed::ProcessControl(void)
lbAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LB);
if (lbAssoc &&
- TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_FIRSTPERSON
+ TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON
&& TheCamera.Cams[TheCamera.ActiveCam].DirectionWasLooking == LOOKING_LEFT) {
lbAssoc->blendDelta = -1000.0f;
}
@@ -10375,7 +10375,7 @@ CPed::ProcessControl(void)
lbAssoc->blendDelta = -4.0f;
} else {
- if ((TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_FIRSTPERSON
+ if ((TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_1STPERSON
|| TheCamera.Cams[TheCamera.ActiveCam].DirectionWasLooking != LOOKING_LEFT)
&& (!lbAssoc || lbAssoc->blendAmount < 1.0f)) {
CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_LB, 4.0f);