diff options
author | Filip Gawin <filip.gawin@zoho.com> | 2020-04-18 12:29:28 +0200 |
---|---|---|
committer | Filip Gawin <filip.gawin@zoho.com> | 2020-04-18 12:29:28 +0200 |
commit | d6314f9564912393134d832b8cc268dd3dbfcbaa (patch) | |
tree | ae1f36342a40ecf2baff2523c7b85ba140260e77 /src/weapons | |
parent | Merge branch 'master' of https://github.com/GTAmodding/re3 (diff) | |
download | re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar.gz re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar.bz2 re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar.lz re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar.xz re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.tar.zst re3-d6314f9564912393134d832b8cc268dd3dbfcbaa.zip |
Diffstat (limited to 'src/weapons')
-rw-r--r-- | src/weapons/Weapon.h | 48 |
1 files changed, 47 insertions, 1 deletions
diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h index 76fe0870..265ffddb 100644 --- a/src/weapons/Weapon.h +++ b/src/weapons/Weapon.h @@ -3,7 +3,53 @@ #define DRIVEBYAUTOAIMING_MAXDIST (2.5f) #define DOOMAUTOAIMING_MAXDIST (9000.0f) -#include "WeaponType.h" +enum eWeaponType +{ + WEAPONTYPE_UNARMED, + WEAPONTYPE_BASEBALLBAT, + WEAPONTYPE_COLT45, + WEAPONTYPE_UZI, + WEAPONTYPE_SHOTGUN, + WEAPONTYPE_AK47, + WEAPONTYPE_M16, + WEAPONTYPE_SNIPERRIFLE, + WEAPONTYPE_ROCKETLAUNCHER, + WEAPONTYPE_FLAMETHROWER, + WEAPONTYPE_MOLOTOV, + WEAPONTYPE_GRENADE, + WEAPONTYPE_DETONATOR, + WEAPONTYPE_HELICANNON, + WEAPONTYPE_LAST_WEAPONTYPE, + WEAPONTYPE_ARMOUR, + WEAPONTYPE_RAMMEDBYCAR, + WEAPONTYPE_RUNOVERBYCAR, + WEAPONTYPE_EXPLOSION, + WEAPONTYPE_UZI_DRIVEBY, + WEAPONTYPE_DROWNING, + WEAPONTYPE_FALL, + WEAPONTYPE_UNIDENTIFIED, + + WEAPONTYPE_TOTALWEAPONS = WEAPONTYPE_LAST_WEAPONTYPE, + WEAPONTYPE_TOTAL_INVENTORY_WEAPONS = 13, +}; + +enum eWeaponFire { + WEAPON_FIRE_MELEE, + WEAPON_FIRE_INSTANT_HIT, + WEAPON_FIRE_PROJECTILE, + WEAPON_FIRE_AREA_EFFECT, + WEAPON_FIRE_USE +}; + +// Taken from MTA SA, seems it's unchanged +enum eWeaponState +{ + WEAPONSTATE_READY, + WEAPONSTATE_FIRING, + WEAPONSTATE_RELOADING, + WEAPONSTATE_OUT_OF_AMMO, + WEAPONSTATE_MELEE_MADECONTACT +}; class CEntity; class CPhysical; |