summaryrefslogtreecommitdiffstats
path: root/src/weapons
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2020-04-17 19:30:57 +0200
committerFilip Gawin <filip.gawin@zoho.com>2020-04-17 19:30:57 +0200
commit63951d9b957b30a110f42a03edb4833cbbaf380e (patch)
tree8402ea533b91a216a1dfecd865d6d86a443bc74f /src/weapons
parentUpdate README.md (diff)
downloadre3-63951d9b957b30a110f42a03edb4833cbbaf380e.tar
re3-63951d9b957b30a110f42a03edb4833cbbaf380e.tar.gz
re3-63951d9b957b30a110f42a03edb4833cbbaf380e.tar.bz2
re3-63951d9b957b30a110f42a03edb4833cbbaf380e.tar.lz
re3-63951d9b957b30a110f42a03edb4833cbbaf380e.tar.xz
re3-63951d9b957b30a110f42a03edb4833cbbaf380e.tar.zst
re3-63951d9b957b30a110f42a03edb4833cbbaf380e.zip
Diffstat (limited to 'src/weapons')
-rw-r--r--src/weapons/Weapon.h48
1 files changed, 1 insertions, 47 deletions
diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h
index 265ffddb..76fe0870 100644
--- a/src/weapons/Weapon.h
+++ b/src/weapons/Weapon.h
@@ -3,53 +3,7 @@
#define DRIVEBYAUTOAIMING_MAXDIST (2.5f)
#define DOOMAUTOAIMING_MAXDIST (9000.0f)
-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
-};
+#include "WeaponType.h"
class CEntity;
class CPhysical;