From 8647cd083d0a0f302685bed2bad54b7804b107fc Mon Sep 17 00:00:00 2001 From: shel <9306996+afwn90cj93201nixr2e1re@users.noreply.github.com> Date: Wed, 10 Jun 2020 23:24:17 +0400 Subject: [PATCH] push (#168) Co-authored-by: shel <2@shelru.ru> --- gradle.properties | 2 +- .../scripting/include/reapi_gamedll_const.inc | 40 +++++++++++++++++++ reapi/include/cssdk/dlls/regamedll_api.h | 2 +- reapi/include/cssdk/dlls/weapons.h | 5 +++ reapi/src/member_list.cpp | 5 +++ reapi/src/member_list.h | 5 +++ 6 files changed, 57 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index e6c302f..a382be9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ majorVersion=5 -minorVersion=14 +minorVersion=15 maintenanceVersion=0 diff --git a/reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc b/reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc index 8c59069..71bece9 100644 --- a/reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc +++ b/reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc @@ -5843,6 +5843,46 @@ enum CKnife_Members * Set params: set_member(index, member, value); */ m_Knife_usKnife, + + /* + * Description: - + * Member type: float + * Get params: get_member(index, member); + * Set params: set_member(index, member, value); + */ + m_Knife_flStabBaseDamage, + + /* + * Description: - + * Member type: float + * Get params: get_member(index, member); + * Set params: set_member(index, member, value); + */ + m_Knife_flSwingBaseDamage, + + /* + * Description: - + * Member type: float + * Get params: get_member(index, member); + * Set params: set_member(index, member, value); + */ + m_Knife_flSwingBaseDamage_Fast, + + /* + * Description: - + * Member type: float + * Get params: get_member(index, member); + * Set params: set_member(index, member, value); + */ + m_Knife_flStabDistance, + + /* + * Description: - + * Member type: float + * Get params: get_member(index, member); + * Set params: set_member(index, member, value); + */ + m_Knife_flSwingDistance, }; /** diff --git a/reapi/include/cssdk/dlls/regamedll_api.h b/reapi/include/cssdk/dlls/regamedll_api.h index 59b8647..e2bbfc6 100644 --- a/reapi/include/cssdk/dlls/regamedll_api.h +++ b/reapi/include/cssdk/dlls/regamedll_api.h @@ -39,7 +39,7 @@ #include #define REGAMEDLL_API_VERSION_MAJOR 5 -#define REGAMEDLL_API_VERSION_MINOR 17 +#define REGAMEDLL_API_VERSION_MINOR 18 // CBasePlayer::Spawn hook typedef IHookChainClass IReGameHook_CBasePlayer_Spawn; diff --git a/reapi/include/cssdk/dlls/weapons.h b/reapi/include/cssdk/dlls/weapons.h index 9d28033..d4d9064 100644 --- a/reapi/include/cssdk/dlls/weapons.h +++ b/reapi/include/cssdk/dlls/weapons.h @@ -580,6 +580,11 @@ public: public: TraceResult m_trHit; unsigned short m_usKnife; + float m_flStabBaseDamage; + float m_flSwingBaseDamage; + float m_flSwingBaseDamage_Fast; + float m_flStabDistance; + float m_flSwingDistance; }; class CM249: public CBasePlayerWeapon { diff --git a/reapi/src/member_list.cpp b/reapi/src/member_list.cpp index bc0e265..ab6b63d 100644 --- a/reapi/src/member_list.cpp +++ b/reapi/src/member_list.cpp @@ -984,6 +984,11 @@ member_t memberlist_ak47[] = { member_t memberlist_knife[] = { KNIFE_MEMBERS(trHit), KNIFE_MEMBERS(usKnife), + KNIFE_MEMBERS(flStabBaseDamage), + KNIFE_MEMBERS(flSwingBaseDamage), + KNIFE_MEMBERS(flSwingBaseDamage_Fast), + KNIFE_MEMBERS(flStabDistance), + KNIFE_MEMBERS(flSwingDistance), }; member_t memberlist_p90[] = { diff --git a/reapi/src/member_list.h b/reapi/src/member_list.h index caf8a86..e7de49e 100644 --- a/reapi/src/member_list.h +++ b/reapi/src/member_list.h @@ -1014,6 +1014,11 @@ enum CKnife_Members { m_Knife_trHit = BEGIN_MEMBER_REGION(knife), m_Knife_usKnife, + m_Knife_flStabBaseDamage, + m_Knife_flSwingBaseDamage, + m_Knife_flSwingBaseDamage_Fast, + m_Knife_flStabDistance, + m_Knife_flSwingDistance, }; enum CP90_Members