summaryrefslogtreecommitdiffstats
path: root/src/weapons/Weapon.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-01 07:16:45 +0200
committerGitHub <noreply@github.com>2019-07-01 07:16:45 +0200
commit95644386473d0990007b6e2513a8f187af675a41 (patch)
tree92e6bfba49d11f7f41c7daa4ea593eb6c128555a /src/weapons/Weapon.h
parentMerge pull request #81 from Nick007J/master (diff)
parentMerge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff)
downloadre3-95644386473d0990007b6e2513a8f187af675a41.tar
re3-95644386473d0990007b6e2513a8f187af675a41.tar.gz
re3-95644386473d0990007b6e2513a8f187af675a41.tar.bz2
re3-95644386473d0990007b6e2513a8f187af675a41.tar.lz
re3-95644386473d0990007b6e2513a8f187af675a41.tar.xz
re3-95644386473d0990007b6e2513a8f187af675a41.tar.zst
re3-95644386473d0990007b6e2513a8f187af675a41.zip
Diffstat (limited to 'src/weapons/Weapon.h')
-rw-r--r--src/weapons/Weapon.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h
index aebcb2c6..7327e1f9 100644
--- a/src/weapons/Weapon.h
+++ b/src/weapons/Weapon.h
@@ -45,11 +45,17 @@ class CWeapon
public:
eWeaponType m_eWeaponType;
eWeaponState m_eWeaponState;
- int32 m_nAmmoInClip;
- int32 m_nAmmoTotal;
+ uint32 m_nAmmoInClip;
+ uint32 m_nAmmoTotal;
int32 m_nTimer;
bool m_bAddRotOffset;
+ CWeapon() {
+ m_bAddRotOffset = false;
+ }
+
+ void Initialise(eWeaponType type, int ammo);
+ void Reload(void);
bool Fire(CEntity*, CVector*);
void AddGunshell(CEntity*, CVector const&, CVector2D const&, float);
};