Skip to content

Commit 8c47b29

Browse files
Synchronize changes from 1.6 master branch [ci skip]
a3b7c85 Refactor CWeaponSA class (#4048) 468ea70 New Crowdin updates (PR #4054) e4aba7c Visual Studio Update cad5e08 Update client en_US pot
2 parents 771a7c4 + a3b7c85 commit 8c47b29

File tree

7 files changed

+2617
-2797
lines changed

7 files changed

+2617
-2797
lines changed

Client/game_sa/CWeaponInfoSA.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class CEntitySAInterface;
1919
// Flame shot array for flamethrower flames and maybe molotovs
2020
#define ARRAY_CFlameShotInfo 0xC89690
2121
#define MAX_FLAME_SHOT_INFOS 100
22+
#define FUNC_CWeaponInfo_GetWeaponReloadTime 0x743D70
2223

2324
class CFlameShotInfo
2425
{
@@ -88,6 +89,8 @@ class CWeaponInfoSAInterface // 112 byte long class
8889
/////////////////////////////////
8990
BYTE m_defaultCombo; // base combo for this melee weapon
9091
BYTE m_nCombosAvailable; // how many further combos are available
92+
93+
int GetWeaponReloadTime() { return ((int(__thiscall*)(CWeaponInfoSAInterface*))FUNC_CWeaponInfo_GetWeaponReloadTime)(this); }
9194
};
9295

9396
class CWeaponInfoSA : public CWeaponInfo

0 commit comments

Comments
 (0)