diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-05-23 16:15:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-23 16:15:12 +0200 |
| commit | 530b5ff58d3bd383b9a48555cec9355f70ecaf20 (patch) | |
| tree | b76392c3addab639379e02b1ba893a5ebf260170 /src/weapons/WeaponType.h | |
| parent | skeleton typos (diff) | |
| parent | Compatibility with VC weapon.dat + new shotguns (diff) | |
| download | re3-530b5ff58d3bd383b9a48555cec9355f70ecaf20.tar re3-530b5ff58d3bd383b9a48555cec9355f70ecaf20.tar.gz re3-530b5ff58d3bd383b9a48555cec9355f70ecaf20.tar.bz2 re3-530b5ff58d3bd383b9a48555cec9355f70ecaf20.tar.lz re3-530b5ff58d3bd383b9a48555cec9355f70ecaf20.tar.xz re3-530b5ff58d3bd383b9a48555cec9355f70ecaf20.tar.zst re3-530b5ff58d3bd383b9a48555cec9355f70ecaf20.zip | |
Diffstat (limited to 'src/weapons/WeaponType.h')
| -rw-r--r-- | src/weapons/WeaponType.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/weapons/WeaponType.h b/src/weapons/WeaponType.h index 4b8be40f..65d715ec 100644 --- a/src/weapons/WeaponType.h +++ b/src/weapons/WeaponType.h @@ -1,6 +1,5 @@ #pragma once -// --MIAMI: TODO enum eWeaponType { WEAPONTYPE_UNARMED, @@ -17,23 +16,31 @@ enum eWeaponType WEAPONTYPE_CHAINSAW, WEAPONTYPE_GRENADE, WEAPONTYPE_DETONATOR_GRENADE, + WEAPONTYPE_TEARGAS, WEAPONTYPE_MOLOTOV, WEAPONTYPE_ROCKET, WEAPONTYPE_COLT45, + WEAPONTYPE_PYTHON, WEAPONTYPE_SHOTGUN, + WEAPONTYPE_SPAS12_SHOTGUN, + WEAPONTYPE_STUBBY_SHOTGUN, WEAPONTYPE_TEC9, WEAPONTYPE_UZI, WEAPONTYPE_SILENCED_INGRAM, WEAPONTYPE_MP5, - WEAPONTYPE_M16, - WEAPONTYPE_AK47, + WEAPONTYPE_M4, + WEAPONTYPE_RUGER, WEAPONTYPE_SNIPERRIFLE, + WEAPONTYPE_LASERSCOPE, WEAPONTYPE_ROCKETLAUNCHER, WEAPONTYPE_FLAMETHROWER, + WEAPONTYPE_M60, + WEAPONTYPE_MINIGUN, WEAPONTYPE_DETONATOR, WEAPONTYPE_HELICANNON, - WEAPONTYPE_LAST_WEAPONTYPE, - WEAPONTYPE_HEALTH, + WEAPONTYPE_CAMERA, + WEAPONTYPE_TOTALWEAPONS = 37, + WEAPONTYPE_HEALTH = 37, WEAPONTYPE_ARMOUR, WEAPONTYPE_RAMMEDBYCAR, WEAPONTYPE_RUNOVERBYCAR, @@ -42,10 +49,8 @@ enum eWeaponType WEAPONTYPE_DROWNING, WEAPONTYPE_FALL, WEAPONTYPE_UNIDENTIFIED, - - WEAPONTYPE_TOTALWEAPONS = WEAPONTYPE_LAST_WEAPONTYPE, - WEAPONTYPE_ANYMELEE = 46, - WEAPONTYPE_ANYWEAPON = 47 + WEAPONTYPE_ANYMELEE, + WEAPONTYPE_ANYWEAPON }; enum { @@ -57,7 +62,7 @@ enum eWeaponFire { WEAPON_FIRE_INSTANT_HIT, WEAPON_FIRE_PROJECTILE, WEAPON_FIRE_AREA_EFFECT, - WEAPON_FIRE_USE + WEAPON_FIRE_CAMERA }; // Taken from MTA SA, seems it's unchanged |