diff options
author | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-12-07 19:50:18 +0100 |
---|---|---|
committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-12-07 19:50:18 +0100 |
commit | 87bca997a45c3364b3994fddb40230ef20a56d90 (patch) | |
tree | 1a4c6997451d097141386bf246dfeef97dd2794c /src/weapons | |
parent | ps2 hud, restore original code (diff) | |
parent | Fixing the Ghost vehicle name. (diff) | |
download | re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar.gz re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar.bz2 re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar.lz re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar.xz re3-87bca997a45c3364b3994fddb40230ef20a56d90.tar.zst re3-87bca997a45c3364b3994fddb40230ef20a56d90.zip |
Diffstat (limited to 'src/weapons')
-rw-r--r-- | src/weapons/Weapon.cpp | 10 | ||||
-rw-r--r-- | src/weapons/WeaponEffects.cpp | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp index 9494c745..dc15485e 100644 --- a/src/weapons/Weapon.cpp +++ b/src/weapons/Weapon.cpp @@ -2288,6 +2288,16 @@ CWeapon::HasWeaponAmmoToBeUsed(void) } bool +CPed::IsPedDoingDriveByShooting(void) +{ + if (FindPlayerPed() == this && GetWeapon()->m_eWeaponType == WEAPONTYPE_UZI) { + if (TheCamera.Cams[TheCamera.ActiveCam].LookingLeft || TheCamera.Cams[TheCamera.ActiveCam].LookingRight) + return true; + } + return false; +} + +bool CWeapon::ProcessLineOfSight(CVector const &point1, CVector const &point2, CColPoint &point, CEntity *&entity, eWeaponType type, CEntity *shooter, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects) { return CWorld::ProcessLineOfSight(point1, point2, point, entity, checkBuildings, checkVehicles, checkPeds, checkObjects, checkDummies, ignoreSeeThrough, ignoreSomeObjects); diff --git a/src/weapons/WeaponEffects.cpp b/src/weapons/WeaponEffects.cpp index 46195d2c..214ae9c7 100644 --- a/src/weapons/WeaponEffects.cpp +++ b/src/weapons/WeaponEffects.cpp @@ -46,7 +46,7 @@ void CWeaponEffects::Shutdown(void) { RwTextureDestroy(gpCrossHairTex); -#ifdef GTA3_1_1_PATCH +#if GTA_VERSION >= GTA3_PC_11 gpCrossHairTex = nil; #endif } |