From 2c138b2b77cf661d9f119061963a726fdcde56d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Mon, 15 Jul 2019 15:11:40 +0300 Subject: Phone, World, Ped --- src/weapons/Weapon.cpp | 6 ++++++ src/weapons/Weapon.h | 1 + 2 files changed, 7 insertions(+) (limited to 'src/weapons') diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp index 90a6408b..cd63544f 100644 --- a/src/weapons/Weapon.cpp +++ b/src/weapons/Weapon.cpp @@ -35,6 +35,12 @@ CWeapon::Reload(void) m_nAmmoInClip = m_nAmmoTotal; } +bool +CWeapon::IsType2Handed(void) +{ + return m_eWeaponType >= WEAPONTYPE_SHOTGUN && m_eWeaponType <= WEAPONTYPE_FLAMETHROWER && m_eWeaponType != WEAPONTYPE_ROCKETLAUNCHER; +} + bool CWeapon::IsTypeMelee(void) { diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h index 81516c4e..fc1d9988 100644 --- a/src/weapons/Weapon.h +++ b/src/weapons/Weapon.h @@ -65,5 +65,6 @@ public: bool Fire(CEntity*, CVector*); void AddGunshell(CEntity*, CVector const&, CVector2D const&, float); bool IsTypeMelee(void); + bool IsType2Handed(void); }; static_assert(sizeof(CWeapon) == 0x18, "CWeapon: error"); -- cgit v1.2.3 From e9cafe340a16c489c5f6874066b9836d70bd0091 Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 23 Jul 2019 16:39:30 +0200 Subject: bit more CAutomobile --- src/weapons/Weapon.cpp | 2 ++ src/weapons/Weapon.h | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/weapons') diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp index cd63544f..0fc89637 100644 --- a/src/weapons/Weapon.cpp +++ b/src/weapons/Weapon.cpp @@ -5,7 +5,9 @@ #include "WeaponInfo.h" WRAPPER bool CWeapon::Fire(CEntity*, CVector*) { EAXJMP(0x55C380); } +WRAPPER void CWeapon::FireFromCar(CAutomobile *car, bool left) { EAXJMP(0x55C940); } WRAPPER void CWeapon::AddGunshell(CEntity*, CVector const&, CVector2D const&, float) { EAXJMP(0x55F770); } +WRAPPER void CWeapon::Update(int32 audioEntity) { EAXJMP(0x563A10); } void CWeapon::Initialise(eWeaponType type, int ammo) diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h index fc1d9988..71fe1f45 100644 --- a/src/weapons/Weapon.h +++ b/src/weapons/Weapon.h @@ -1,5 +1,4 @@ #pragma once -#include "Entity.h" enum eWeaponType { @@ -46,6 +45,9 @@ enum eWeaponState WEAPONSTATE_MELEE_MADECONTACT }; +class CEntity; +class CAutomobile; + class CWeapon { public: @@ -61,8 +63,10 @@ public: } void Initialise(eWeaponType type, int ammo); + void Update(int32 audioEntity); void Reload(void); bool Fire(CEntity*, CVector*); + void FireFromCar(CAutomobile *car, bool left); void AddGunshell(CEntity*, CVector const&, CVector2D const&, float); bool IsTypeMelee(void); bool IsType2Handed(void); -- cgit v1.2.3