diff options
| author | aap <aap@papnet.eu> | 2019-07-07 21:09:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-07 21:09:40 +0200 |
| commit | 6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3 (patch) | |
| tree | 726feb5b5fdc365ffdaa44208380e738d69ad2ff /src/weapons/Weapon.h | |
| parent | Merge pull request #120 from ShFil119/audio4 (diff) | |
| parent | Darkel is bored. (diff) | |
| download | re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar.gz re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar.bz2 re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar.lz re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar.xz re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.tar.zst re3-6ec421fe7bc683e0d056d2a1b9d0bd0d159cf8e3.zip | |
Diffstat (limited to 'src/weapons/Weapon.h')
| -rw-r--r-- | src/weapons/Weapon.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h index ba552035..81516c4e 100644 --- a/src/weapons/Weapon.h +++ b/src/weapons/Weapon.h @@ -1,9 +1,9 @@ #pragma once #include "Entity.h" -enum eWeaponType : uint32 +enum eWeaponType { - WEAPONTYPE_UNARMED = 0, + WEAPONTYPE_UNARMED, WEAPONTYPE_BASEBALLBAT, WEAPONTYPE_COLT45, WEAPONTYPE_UZI, @@ -16,10 +16,16 @@ enum eWeaponType : uint32 WEAPONTYPE_MOLOTOV, WEAPONTYPE_GRENADE, WEAPONTYPE_DETONATOR, - NUM_PED_WEAPONTYPES = 13, - WEAPONTYPE_HELICANNON = 13, - NUM_WEAPONTYPES, - NO_STORED_WEAPON = 22 + WEAPONTYPE_TOTAL_INVENTORY_WEAPONS, + WEAPONTYPE_TOTALWEAPONS, + WEAPONTYPE_ARMOUR, + WEAPONTYPE_RAMMEDBYCAR, + WEAPONTYPE_RUNOVERBYCAR, + WEAPONTYPE_EXPLOSION, + WEAPONTYPE_UZI_DRIVEBY, + WEAPONTYPE_WATER, + WEAPONTYPE_FALL_DAMAGE, + WEAPONTYPE_UNIDENTIFIED, }; enum eWeaponFire { |