summaryrefslogtreecommitdiffstats
path: root/src/weapons/Weapon.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-03-29 17:43:43 +0200
committerGitHub <noreply@github.com>2020-03-29 17:43:43 +0200
commit0cbdca632fae35923d585cd791d8d8b84c93103e (patch)
treede9f8dbd0e3c06ffbb95b13c0637dfc3db3873c1 /src/weapons/Weapon.h
parentMerge pull request #367 from Sergeanur/wrappers_cleanup (diff)
parentMerge branch 'master' into master (diff)
downloadre3-0cbdca632fae35923d585cd791d8d8b84c93103e.tar
re3-0cbdca632fae35923d585cd791d8d8b84c93103e.tar.gz
re3-0cbdca632fae35923d585cd791d8d8b84c93103e.tar.bz2
re3-0cbdca632fae35923d585cd791d8d8b84c93103e.tar.lz
re3-0cbdca632fae35923d585cd791d8d8b84c93103e.tar.xz
re3-0cbdca632fae35923d585cd791d8d8b84c93103e.tar.zst
re3-0cbdca632fae35923d585cd791d8d8b84c93103e.zip
Diffstat (limited to 'src/weapons/Weapon.h')
-rw-r--r--src/weapons/Weapon.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h
index 1db66720..74145564 100644
--- a/src/weapons/Weapon.h
+++ b/src/weapons/Weapon.h
@@ -15,17 +15,19 @@ enum eWeaponType
WEAPONTYPE_MOLOTOV,
WEAPONTYPE_GRENADE,
WEAPONTYPE_DETONATOR,
- WEAPONTYPE_TOTAL_INVENTORY_WEAPONS = 13,
- WEAPONTYPE_HELICANNON = 13,
- WEAPONTYPE_TOTALWEAPONS,
+ WEAPONTYPE_HELICANNON,
+ WEAPONTYPE_LAST_WEAPONTYPE,
WEAPONTYPE_ARMOUR,
WEAPONTYPE_RAMMEDBYCAR,
WEAPONTYPE_RUNOVERBYCAR,
WEAPONTYPE_EXPLOSION,
WEAPONTYPE_UZI_DRIVEBY,
- WEAPONTYPE_WATER,
- WEAPONTYPE_FALL_DAMAGE,
+ WEAPONTYPE_DROWNING,
+ WEAPONTYPE_FALL,
WEAPONTYPE_UNIDENTIFIED,
+
+ WEAPONTYPE_TOTALWEAPONS = WEAPONTYPE_LAST_WEAPONTYPE,
+ WEAPONTYPE_TOTAL_INVENTORY_WEAPONS = 13,
};
enum eWeaponFire {
@@ -63,6 +65,7 @@ public:
m_bAddRotOffset = false;
}
+ static void ShutdownWeapons(void);
void Initialise(eWeaponType type, int ammo);
void Update(int32 audioEntity);
void Reload(void);