Compatibility with VC weapon.dat + new shotguns

2020-05-23 16:53:20 +03:00
parent 9313bfa155
commit 5357957fe1
21 changed files with 433 additions and 233 deletions
--- a/src/weapons/Weapon.h
+++ b/src/weapons/Weapon.h
@@ -68,6 +68,8 @@ public:
 	static void BlowUpExplosiveThings(CEntity *thing);
 	bool HasWeaponAmmoToBeUsed(void);
 	
+	static bool IsShotgun(int weapon) { return weapon == WEAPONTYPE_SHOTGUN || weapon == WEAPONTYPE_SPAS12_SHOTGUN || weapon == WEAPONTYPE_STUBBY_SHOTGUN; }
+
 	static bool ProcessLineOfSight(CVector const &point1, CVector const &point2, CColPoint &point, CEntity *&entity, eWeaponType type, CEntity *shooter, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects);

 #ifdef COMPATIBLE_SAVES