1 files changed, 25 insertions, 3 deletions

diff --git a/src/weapons/WeaponInfo.h b/src/weapons/WeaponInfo.h
index 96e2ecf4..d7f1563d 100644
--- a/src/weapons/WeaponInfo.h
+++ b/src/weapons/WeaponInfo.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "AnimManager.h"
 #include "AnimationId.h"
 #include "WeaponType.h"
 
@@ -16,10 +17,25 @@ enum
 	WEAPONFLAG_1ST_PERSON = 1 << 8,
 	WEAPONFLAG_HEAVY = 1 << 9,
 	WEAPONFLAG_THROW = 1 << 10,
+	WEAPONFLAG_RELOAD_LOOP2START = 1 << 11,
+	WEAPONFLAG_USE_2ND = 1 << 12,
+	WEAPONFLAG_GROUND_2ND = 1 << 13,
+	WEAPONFLAG_FINISH_3RD = 1 << 14,
+	WEAPONFLAG_RELOAD = 1 << 15,
+	WEAPONFLAG_FIGHTMODE = 1 << 16,
+	WEAPONFLAG_CROUCHFIRE = 1 << 17,
+	WEAPONFLAG_COP3_RD = 1 << 18,
+	WEAPONFLAG_GROUND_3RD = 1 << 19,
+	WEAPONFLAG_PARTIALATTACK = 1 << 20,
+	WEAPONFLAG_ANIMDETONATE = 1 << 21,
 };
 
 class CWeaponInfo {
+	static char ms_aWeaponNames[WEAPONTYPE_TOTALWEAPONS][32];
 public:
+	static uint16 ms_aReloadSampleTime[WEAPONTYPE_TOTALWEAPONS];
+	static int32 ms_aMaxAmmoForWeapon[WEAPONTYPE_TOTALWEAPONS];
+
 	eWeaponFire m_eWeaponFire;
 	float m_fRange;
 	uint32 m_nFiringRate;
@@ -31,22 +47,28 @@ public:
 	float m_fLifespan;
 	float m_fSpread;
 	CVector m_vecFireOffset;
-	AnimationId m_AnimToPlay;
-	AnimationId m_Anim2ToPlay;
+	AssocGroupId m_AnimToPlay;
 	float m_fAnimLoopStart;
 	float m_fAnimLoopEnd;
 	float m_fAnimFrameFire;
+	float m_fAnim2LoopStart;
+	float m_fAnim2LoopEnd;
 	float m_fAnim2FrameFire;
+	float m_fAnimBreakout;
 	int32 m_nModelId;
+	int32 m_nModel2Id;
 	uint32 m_Flags;
 
+	uint32 m_nWeaponSlot;
+
 	static void Initialise(void);
 	static void LoadWeaponData(void);
 	static CWeaponInfo *GetWeaponInfo(eWeaponType weaponType);
 	static eWeaponFire FindWeaponFireType(char *name);
 	static eWeaponType FindWeaponType(char *name);
 	static void Shutdown(void);
+	static bool IsWeaponSlotAmmoMergeable(uint32 slot) { return slot == WEAPONSLOT_SHOTGUN || slot == WEAPONSLOT_SUBMACHINEGUN || slot == WEAPONSLOT_RIFLE; }
 	bool IsFlagSet(uint32 flag) const { return (m_Flags & flag) != 0; }
 };
 
-VALIDATE_SIZE(CWeaponInfo, 0x54);
\ No newline at end of file
+VALIDATE_SIZE(CWeaponInfo, 0x64);