Merge branch 'master' into master

2019-07-07 09:21:44 +02:00
parent 29767c1964 00461224a9
commit 0ac6d0515e
43 changed files with 3384 additions and 1306 deletions
--- a/src/weapons/Weapon.h
+++ b/src/weapons/Weapon.h
@@ -64,5 +64,6 @@ public:
 	void Reload(void);
 	bool Fire(CEntity*, CVector*);
 	void AddGunshell(CEntity*, CVector const&, CVector2D const&, float);
+	bool IsTypeMelee(void);
 };
 static_assert(sizeof(CWeapon) == 0x18, "CWeapon: error");