Skip to content

Refactor CWeaponSA class #4048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 1, 2025
Merged

Refactor CWeaponSA class #4048

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
80be6cf
Refactor
FileEX Feb 21, 2025
ea190e5
Remove includes
FileEX Feb 21, 2025
5273a2d
Review
FileEX Feb 21, 2025
b669503
Review
FileEX Feb 23, 2025
1b0cfaa
Merge branch 'master' into refactor/CWeaponSA
Dutchman101 Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Client/game_sa/CWeaponInfoSA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class CEntitySAInterface;
// Flame shot array for flamethrower flames and maybe molotovs
#define ARRAY_CFlameShotInfo 0xC89690
#define MAX_FLAME_SHOT_INFOS 100
#define FUNC_CWeaponInfo_GetWeaponReloadTime 0x743D70

class CFlameShotInfo
{
Expand Down Expand Up @@ -88,6 +89,8 @@ class CWeaponInfoSAInterface // 112 byte long class
/////////////////////////////////
BYTE m_defaultCombo; // base combo for this melee weapon
BYTE m_nCombosAvailable; // how many further combos are available

int GetWeaponReloadTime() { return ((int(__thiscall*)(CWeaponInfoSAInterface*))FUNC_CWeaponInfo_GetWeaponReloadTime)(this); }
};

class CWeaponInfoSA : public CWeaponInfo
Expand Down
Loading
Loading