Skip to content

Commit

Permalink
Add m_M4A1_flBaseDamageSil, m_USP_flBaseDamageSil and m_Famas_flBaseD…
Browse files Browse the repository at this point in the history
…amageBurst members (#126)

* Add m_M4A1_flBaseDamageSil, m_USP_flBaseDamageSil and m_Famas_flBaseDamageBurst members
  • Loading branch information
fant1kua authored and s1lentq committed Jan 23, 2019
1 parent ed52636 commit bc1924b
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 1 deletion.
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 @@ -5356,6 +5364,14 @@ enum CUSP_Members
* Set params: set_member(index, member, value);
*/
m_USP_usFire,

/*
* 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,
};

/**
Expand Down Expand Up @@ -5514,6 +5530,14 @@ enum CM4A1_Members
* Set params: set_member(index, member, value);
*/
m_M4A1_usFire,

/*
* 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,
};

/**
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 @@ -349,6 +349,7 @@ class CUSP: public CBasePlayerWeapon {
public:
int m_iShell;
unsigned short m_usFire;
float m_flBaseDamageSil;
};

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

class CMAC10: public CBasePlayerWeapon {
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,11 +890,13 @@ 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(usFire),
USP_MEMBERS(flBaseDamageSil),
};

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

member_t memberlist_tmp[] = {
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,12 +917,14 @@ 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_usFire,
m_USP_flBaseDamageSil,
};

enum CGLOCK18_Members
Expand Down Expand Up @@ -963,6 +965,7 @@ enum CM4A1_Members
m_M4A1_iShell = BEGIN_MEMBER_REGION(m4a1),
m_M4A1_iShellOn,
m_M4A1_usFire,
m_M4A1_flBaseDamageSil,
};

enum CTMP_Members
Expand Down

0 comments on commit bc1924b

Please sign in to comment.