Skip to content
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.

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

Add m_M4A1_flBaseDamageSil, m_USP_flBaseDamageSil and m_Famas_flBaseDamageBurst members #126

Merged
merged 2 commits into from
Jan 23, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
majorVersion=5
minorVersion=7
minorVersion=8
maintenanceVersion=0
24 changes: 24 additions & 0 deletions reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc
Original file line number Diff line number Diff line change
Expand Up @@ -5334,6 +5334,14 @@ enum CFamas_Members
* Set params: set_member(index, member, value);
*/
m_Famas_iShellOn,

/*
* Description: Basic damage that famas deals before any multiplier, such as hitgroup, armor, distance and bullet penetration in burst mode
* Member type: float
* Get params: get_member(index, member);
* Set params: set_member(index, member, value);
*/
m_Famas_flBaseDamageBurst,
};

/**
Expand All @@ -5349,6 +5357,14 @@ enum CUSP_Members
*/
m_USP_iShell = BEGIN_MEMBER_REGION(usp),

/*
* Description: Basic damage that usp deals before any multiplier, such as hitgroup, armor, distance and bullet penetration in silence mdoe
* Member type: float
* Get params: get_member(index, member);
* Set params: set_member(index, member, value);
*/
m_USP_flBaseDamageSil,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks backward compatibility, you should place it at the end.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


/*
* Description: -
* Member type: unsigned short
Expand Down Expand Up @@ -5507,6 +5523,14 @@ enum CM4A1_Members
*/
m_M4A1_iShellOn,

/*
* Description: Basic damage that m4a1 deals before any multiplier, such as hitgroup, armor, distance and bullet penetration in silence mdoe
* Member type: float
* Get params: get_member(index, member);
* Set params: set_member(index, member, value);
*/
m_M4A1_flBaseDamageSil,

/*
* Description: -
* Member type: unsigned short
Expand Down
3 changes: 3 additions & 0 deletions reapi/include/cssdk/dlls/weapons.h
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ class CUSP: public CBasePlayerWeapon {
virtual BOOL IsPistol() = 0;
public:
int m_iShell;
float m_flBaseDamageSil;
unsigned short m_usFire;
};

Expand Down Expand Up @@ -633,6 +634,7 @@ class CM4A1: public CBasePlayerWeapon {
public:
int m_iShell;
int m_iShellOn;
float m_flBaseDamageSil;
unsigned short m_usFire;
};

Expand Down Expand Up @@ -873,4 +875,5 @@ class CFamas: public CBasePlayerWeapon {
public:
int m_iShell;
int m_iShellOn;
float m_flBaseDamageBurst;
};
3 changes: 3 additions & 0 deletions reapi/src/member_list.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -890,10 +890,12 @@ member_t memberlist_galil[] = {
member_t memberlist_famas[] = {
FAMAS_MEMBERS(iShell),
FAMAS_MEMBERS(iShellOn),
FAMAS_MEMBERS(flBaseDamageBurst),
};

member_t memberlist_usp[] = {
USP_MEMBERS(iShell),
USP_MEMBERS(flBaseDamageSil),
USP_MEMBERS(usFire),
};

Expand Down Expand Up @@ -928,6 +930,7 @@ member_t memberlist_m3[] = {
member_t memberlist_m4a1[] = {
M4A1_MEMBERS(iShell),
M4A1_MEMBERS(iShellOn),
M4A1_MEMBERS(flBaseDamageSil),
M4A1_MEMBERS(usFire),
};

Expand Down
3 changes: 3 additions & 0 deletions reapi/src/member_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -917,11 +917,13 @@ enum CFamas_Members
{
m_Famas_iShell = BEGIN_MEMBER_REGION(famas),
m_Famas_iShellOn,
m_Famas_flBaseDamageBurst,
};

enum CUSP_Members
{
m_USP_iShell = BEGIN_MEMBER_REGION(usp),
m_USP_flBaseDamageSil,
m_USP_usFire,
};

Expand Down Expand Up @@ -962,6 +964,7 @@ enum CM4A1_Members
{
m_M4A1_iShell = BEGIN_MEMBER_REGION(m4a1),
m_M4A1_iShellOn,
m_M4A1_flBaseDamageSil,
m_M4A1_usFire,
};

Expand Down