summaryrefslogtreecommitdiffstats
path: root/src/weapons/Weapon.h
diff options
context:
space:
mode:
author_AG <gennariarmando@outlook.com>2019-07-04 22:31:21 +0200
committer_AG <gennariarmando@outlook.com>2019-07-04 22:33:19 +0200
commit9fed0c040c482bac8cba688e7564c8e8dfe23b30 (patch)
tree6098d16b702a3a057cd0bbd39bf3ece217c832c8 /src/weapons/Weapon.h
parentMerge pull request #110 from erorcun/erorcun (diff)
downloadre3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar
re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.gz
re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.bz2
re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.lz
re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.xz
re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.zst
re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.zip
Diffstat (limited to '')
-rw-r--r--src/weapons/Weapon.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h
index 8cb435ce..a8a5d9b3 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 {